Skip to content

Commit 2babb0e

Browse files
xlogixxlogix
committed
Fixed some bugs in Ads. Version 1.1.1
1 parent 52a6385 commit 2babb0e

File tree

7 files changed

+30
-39
lines changed

7 files changed

+30
-39
lines changed

‎app/build.gradle‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
applicationId "com.instify.android"
2525
minSdkVersion 16
2626
targetSdkVersion 25
27-
versionCode 7
28-
versionName "1.1.0"
27+
versionCode 8
28+
versionName "1.1.1"
2929
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3030
vectorDrawables.useSupportLibrary = true
3131
}
@@ -57,55 +57,52 @@ dependencies {
5757
compile fileTree(dir: 'libs', include: ['*.jar'])
5858

5959
// for App Invites and Dynamic Links
60-
compile 'com.google.firebase:firebase-appindexing:10.2.0'
61-
compile 'com.google.firebase:firebase-invites:10.2.0'
60+
compile 'com.google.firebase:firebase-appindexing:10.2.1'
61+
compile 'com.google.firebase:firebase-invites:10.2.1'
6262
// for cloud messaging i.e sending notifications
63-
compile 'com.google.firebase:firebase-messaging:10.2.0'
63+
compile 'com.google.firebase:firebase-messaging:10.2.1'
6464

6565
// ADS
66-
compile 'com.google.firebase:firebase-ads:10.2.0'
66+
compile 'com.google.firebase:firebase-ads:10.2.1'
6767

6868
// AUTH
69-
compile 'com.google.firebase:firebase-auth:10.2.0'
70-
compile 'com.google.android.gms:play-services-auth:10.2.0'
69+
compile 'com.google.firebase:firebase-auth:10.2.1'
70+
compile 'com.google.android.gms:play-services-auth:10.2.1'
7171

7272
// DATABASE
73-
compile 'com.google.firebase:firebase-database:10.2.0'
73+
compile 'com.google.firebase:firebase-database:10.2.1'
7474
compile 'com.firebaseui:firebase-ui-database:1.2.0'
7575

7676
// CRASH (ONLY FOR RELEASE)
77-
releaseCompile 'com.google.firebase:firebase-crash:10.2.0'
77+
releaseCompile 'com.google.firebase:firebase-crash:10.2.1'
7878

7979
// IMAGE AND LOADING
8080
compile 'de.hdodenhof:circleimageview:2.1.0'
8181
compile 'com.android.volley:volley:1.0.0'
8282
compile 'com.github.bumptech.glide:glide:3.7.0'
83-
compile 'pub.devrel:easypermissions:0.3.0'
83+
compile 'pub.devrel:easypermissions:0.3.1'
8484

8585
// WEB VIEW
8686
compile 'com.thefinestartist:finestwebview:1.2.7'
8787

8888
// LOGGING
8989
compile 'com.jakewharton.timber:timber:4.5.1'
90-
compile 'com.google.firebase:firebase-core:10.2.0'
91-
compile 'com.google.firebase:firebase-config:10.2.0'
90+
compile 'com.google.firebase:firebase-core:10.2.1'
91+
compile 'com.google.firebase:firebase-config:10.2.1'
9292

9393
// SERVICE
9494
compile 'net.gotev:uploadservice:3.2.3'
9595

9696
// STORAGE FIREBASE
97-
compile 'com.google.firebase:firebase-storage:10.2.0'
97+
compile 'com.google.firebase:firebase-storage:10.2.1'
9898

9999
// SUPPORTING LIBRARIES
100-
compile 'com.android.support:appcompat-v7:25.3.0'
101-
compile 'com.android.support:palette-v7:25.3.0'
102-
compile 'com.android.support:customtabs:25.3.0'
103-
compile 'com.android.support:design:25.3.0'
104-
compile 'com.android.support:support-v4:25.3.0'
105-
compile 'com.android.support:support-v13:25.3.0'
106-
compile 'com.android.support:recyclerview-v7:25.3.0'
107-
compile 'com.android.support:cardview-v7:25.3.0'
108-
compile 'com.android.support:support-vector-drawable:25.3.0'
100+
compile 'com.android.support:appcompat-v7:25.3.1'
101+
compile 'com.android.support:design:25.3.1'
102+
compile 'com.android.support:support-v4:25.3.1'
103+
compile 'com.android.support:recyclerview-v7:25.3.1'
104+
compile 'com.android.support:cardview-v7:25.3.1'
105+
compile 'com.android.support:support-vector-drawable:25.3.1'
109106

110107
// UI
111108
compile 'com.github.paolorotolo:appintro:4.1.0'
@@ -120,7 +117,7 @@ dependencies {
120117

121118
// TESTING
122119
androidTestCompile 'com.android.support.test:runner:0.5'
123-
androidTestCompile 'com.android.support:support-annotations:25.3.0'
120+
androidTestCompile 'com.android.support:support-annotations:25.3.1'
124121
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
125122
exclude group: 'com.android.support', module: 'support-annotations'
126123
})

‎app/src/main/java/com/instify/android/ux/MainActivity.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,13 @@ public void onBackPressed() {
108108
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
109109
if (drawer.isDrawerOpen(GravityCompat.START)) {
110110
drawer.closeDrawer(GravityCompat.START);
111+
111112
} else if (doubleBackToExitPressedOnce) {
112113
super.onBackPressed();
114+
113115
} else {
114116
this.doubleBackToExitPressedOnce = true;
115117
Toast.makeText(this, "Press again to exit", Toast.LENGTH_SHORT).show();
116-
117118
new Handler().postDelayed(new Runnable() {
118119

119120
@Override
@@ -142,7 +143,6 @@ protected void onResume() {
142143
super.onResume();
143144
// Ensures that user didn't un-install Google Play Services required for Firebase related tasks.
144145
checkPlayServices();
145-
146146
// Checks if the device is connected to the internet
147147
if (isDeviceOnline()) {
148148
Timber.d(TAG, "Device is online.");
@@ -158,7 +158,6 @@ protected void onResume() {
158158
public void onDestroy() {
159159
super.onDestroy();
160160
}
161-
// [END add_lifecycle_methods]
162161

163162
@Override
164163
protected void onCreate(Bundle savedInstanceState) {
@@ -340,7 +339,7 @@ public void onCancelled(DatabaseError databaseError) {
340339
// [START request_new_interstitial]
341340
private void requestNewInterstitial() {
342341
AdRequest adRequest = new AdRequest.Builder()
343-
.addTestDevice("11408151BC4116DE6AD4B6BFC1B34457")
342+
//.addTestDevice("11408151BC4116DE6AD4B6BFC1B34457")
344343
.build();
345344

346345
mInterstitialAd.loadAd(adRequest);

‎app/src/main/java/com/instify/android/ux/NotesUploadActivity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import com.instify.android.R;
2121
import com.instify.android.app.AppConfig;
22-
import com.instify.android.helpers.NotesFilePathHelper;
2322
import com.instify.android.helpers.SQLiteHandler;
2423

2524
import net.gotev.uploadservice.MultipartUploadRequest;

‎app/src/main/java/com/instify/android/ux/adapters/NotesAdapter.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class NotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
2525

2626
private Context context;
2727
private LayoutInflater inflater;
28-
List<NotesModel> data = Collections.emptyList();
28+
private List<NotesModel> data = Collections.emptyList();
2929

3030
// create constructor to initialize context and data sent from MainActivity
3131
public NotesAdapter(Context context, List<NotesModel> data) {
@@ -71,10 +71,7 @@ public int getItemCount() {
7171
class MyHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
7272

7373
TextView textFishName;
74-
TextView textSize;
7574
TextView textType;
76-
TextView textPrice;
77-
NetworkImageView imageView;
7875

7976
// create constructor to get widget reference
8077
public MyHolder(View itemView) {

‎app/src/main/res/layout/activity_post_notes.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
android:id="@+id/textView5"
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"
21-
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." />
21+
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."
22+
android:textSize="16sp" />
2223

2324
<android.support.design.widget.TextInputLayout
2425
android:layout_width="match_parent"

‎app/src/main/res/menu/menu_main.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
<item
2222
android:id="@+id/filter_by_class"
2323
android:checked="false"
24-
android:title="Filter By Class"
24+
android:title="Filter by Class"
2525
app:showAsAction="never" />
2626
<item
2727
android:id="@+id/filter_by_department"
2828
android:checked="false"
29-
android:title="Filter By Department"
29+
android:title="Filter by Department"
3030
app:showAsAction="never" />
3131
<item
3232
android:id="@+id/filter_by_university"
3333
android:checked="false"
34-
android:title="All"
34+
android:title="Filter by University"
3535
app:showAsAction="never" />
3636
</menu>
3737
</item>

‎app/src/main/res/menu/search_main.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
tools:context=".SearchResultsActivity">
6-
76
<item
87
android:id="@+id/action_search"
98
android:icon="@android:drawable/ic_menu_search"
@@ -16,5 +15,4 @@
1615
android:icon="@android:drawable/ic_menu_add"
1716
android:title="Add"
1817
app:showAsAction="always" />
19-
2018
</menu>

0 commit comments

Comments
 (0)