Ads fix

Signed-off-by: krayong <kgourisaria2001@gmail.com>

Author: krayong

app/src/main/AndroidManifest.xml

@@ -44,12 +44,12 @@
             tools:replace="android:launchMode"
             android:launchMode="standard" />
 
-<!--        <meta-data-->
-<!--            android:name="com.google.android.gms.ads.APPLICATION_ID"-->
-<!--            android:value="ca-app-pub-4955404294529066~6991752987"/>-->
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-3940256099942544~3347511713"/>
+            android:value="ca-app-pub-4955404294529066~6991752987"/>
+<!--        <meta-data-->
+<!--            android:name="com.google.android.gms.ads.APPLICATION_ID"-->
+<!--            android:value="ca-app-pub-3940256099942544~3347511713"/>-->
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />

app/src/main/java/com/studypartner/fragments/FileFragment.java

@@ -1427,6 +1427,12 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
 			if (resultCode == Activity.RESULT_OK) {
 				assert data != null;
 				ArrayList<Uri> imagePaths = new ArrayList<>(Objects.requireNonNull(data.<Uri>getParcelableArrayListExtra(FilePickerConst.KEY_SELECTED_MEDIA)));
+				if (imagePaths.size() > 2) {
+					if (mInterstitialAd.isLoaded()) {
+						mInterstitialAd.show();
+					}
+				}
+				
 				for (Uri uri : imagePaths) {
 					String filePath = FileUtils.getFilePath(requireContext(), uri);
 					notes.add(new FileItem(FileUtils.copyFile(filePath, noteFolder.getPath())));
@@ -1463,6 +1469,13 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
 				assert data != null;
 				if (null != data.getClipData()) {
 					Log.d(TAG, "onActivityResult: document count = " + data.getClipData().getItemCount());
+					
+					if (data.getClipData().getItemCount() > 2) {
+						if (mInterstitialAd.isLoaded()) {
+							mInterstitialAd.show();
+						}
+					}
+					
 					for (int i = 0; i < data.getClipData().getItemCount(); i++) {
 						Uri uri = data.getClipData().getItemAt(i).getUri();
 						String filePath = FileUtils.getFilePath(requireContext(), uri);
@@ -1494,6 +1507,13 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
 			if (resultCode == Activity.RESULT_OK) {
 				assert data != null;
 				ArrayList<Uri> videoPaths = new ArrayList<>(Objects.requireNonNull(data.<Uri>getParcelableArrayListExtra(FilePickerConst.KEY_SELECTED_MEDIA)));
+				
+				if (videoPaths.size() > 2) {
+					if (mInterstitialAd.isLoaded()) {
+						mInterstitialAd.show();
+					}
+				}
+				
 				for (Uri uri : videoPaths) {
 					String filePath = FileUtils.getFilePath(requireContext(), uri);
 					notes.add(new FileItem(FileUtils.copyFile(filePath, noteFolder.getPath())));
@@ -1515,6 +1535,14 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
 				assert data != null;
 				if (null != data.getClipData()) {
 					Log.d(TAG, "onActivityResult: audio count = " + data.getClipData().getItemCount());
+					
+					if (data.getClipData().getItemCount() > 2) {
+						if (mInterstitialAd.isLoaded()) {
+							mInterstitialAd.show();
+						}
+					}
+					
+					
 					for (int i = 0; i < data.getClipData().getItemCount(); i++) {
 						Uri uri = data.getClipData().getItemAt(i).getUri();
 						String filePath = FileUtils.getFilePath(requireContext(), uri);

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

@@ -160,15 +160,17 @@
 
             <TextView
                 android:id="@+id/attendanceItemSubjectName"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/mediumMargin"
+                android:layout_marginEnd="@dimen/smallMargin"
                 android:textAllCaps="true"
                 android:textColor="@color/alternativeText"
                 android:textSize="@dimen/largeText"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/attendanceItemEditButton"
                 app:layout_constraintBottom_toBottomOf="parent"
                 tools:text="Java" />
 

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

@@ -189,7 +189,7 @@
     <string name="team_developer">Lead Developer</string>
     <string name="team_karan_gourisaria">Karan Gourisaria</string>
 
-<!--    <string name="notes_interstitial_ad">ca-app-pub-4955404294529066/1479765372</string>!-->
-    <string name="notes_interstitial_ad">ca-app-pub-3940256099942544/1033173712</string>
+    <string name="notes_interstitial_ad">ca-app-pub-4955404294529066/1479765372</string>!
+<!--    <string name="notes_interstitial_ad">ca-app-pub-3940256099942544/1033173712</string>-->
 
 </resources>