From 87242b8b00c7b1f2fa425eacff0f068e3f0e0f2f Mon Sep 17 00:00:00 2001
From: shivaprasadks <shivaprasad.kssp@gmail.com>
Date: Thu, 5 May 2016 00:50:22 +0530
Subject: [PATCH] version 6 (2.0) release

---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              |  7 +--
 .../pucresults/LaunchActivity.java            | 52 +++++++++++++++++--
 app/src/main/res/layout/content_launch.xml    | 30 ++++++++---
 4 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c29358c..fc0fbf3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.mosambitech.pucresults"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 7
+        versionName "2.0"
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 13d1abf..7f98d0a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="Results App"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <meta-data
@@ -38,7 +38,7 @@
 
         <activity
             android:name=".LaunchActivity"
-            android:label="@string/app_name"
+            android:label="Results"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -55,7 +55,8 @@
 
         <activity
             android:name=".ResultActivity"
-            android:label="Results"/>
+            android:label="Results"
+            android:screenOrientation="portrait"/>
 
         <activity
             android:name="com.google.android.gms.ads.AdActivity"
diff --git a/app/src/main/java/com/mosambitech/pucresults/LaunchActivity.java b/app/src/main/java/com/mosambitech/pucresults/LaunchActivity.java
index bd8eeed..e23106f 100644
--- a/app/src/main/java/com/mosambitech/pucresults/LaunchActivity.java
+++ b/app/src/main/java/com/mosambitech/pucresults/LaunchActivity.java
@@ -13,11 +13,18 @@
 import android.widget.Toast;
 
 import com.beardedhen.androidbootstrap.TypefaceProvider;
+import com.google.android.gms.ads.AdListener;
+import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.AdView;
+import com.google.android.gms.ads.InterstitialAd;
 import com.pushbots.push.Pushbots;
 
 public class LaunchActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
     View cet, sslc, puc, comedk;
+    AdRequest adRequest;
+
+    private InterstitialAd interstitial;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,6 +36,39 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        //adview
+
+        AdView adview = (AdView) this.findViewById(R.id.adview);
+        adRequest = new AdRequest.Builder().build();
+        adview.loadAd(adRequest);
+
+        //interstitials
+        interstitial = new InterstitialAd(LaunchActivity.this);
+        // Insert the Ad Unit ID
+        interstitial.setAdUnitId("ca-app-pub-9668220491500664/5847868231");
+
+        // Locate the Banner Ad in activity_main.xml
+
+        // Request for Ads
+        AdRequest adRequest = new AdRequest.Builder().build();
+
+        // Add a test device to show Test Ads
+
+        // Load ads into Banner Ads
+
+        // Load ads into Interstitial Ads
+        interstitial.loadAd(adRequest);
+
+        // Prepare an Interstitial Ad Listener
+        interstitial.setAdListener(new AdListener() {
+            public void onAdLoaded() {
+                // Call displayInterstitial() function
+                interstitial.show();
+            }
+        });
+
+
+
         sslc = (View) findViewById(R.id.btn_sslc);
         cet = (View) findViewById(R.id.btn_cet);
         puc = (View) findViewById(R.id.btn_puc);
@@ -47,36 +87,40 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View v) {
                 Intent i = new Intent(LaunchActivity.this, ResultActivity.class);
-                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+
                 i.putExtra("LANG_TAG", "SSLC");
                 startActivity(i);
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
             }
         });
         puc.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent i = new Intent(LaunchActivity.this, ResultActivity.class);
-                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+
                 i.putExtra("LANG_TAG", "PUC");
                 startActivity(i);
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
             }
         });
         cet.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent i = new Intent(LaunchActivity.this, ResultActivity.class);
-                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+
                 i.putExtra("LANG_TAG", "CET");
                 startActivity(i);
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
             }
         });
         comedk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent i = new Intent(LaunchActivity.this, ResultActivity.class);
-                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+
                 i.putExtra("LANG_TAG", "COMED K");
                 startActivity(i);
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
             }
         });
 
diff --git a/app/src/main/res/layout/content_launch.xml b/app/src/main/res/layout/content_launch.xml
index 8cdcb43..9053571 100644
--- a/app/src/main/res/layout/content_launch.xml
+++ b/app/src/main/res/layout/content_launch.xml
@@ -1,27 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     android:background="@color/titini_gold"
+    android:orientation="vertical"
+
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="com.mosambitech.pucresults.LaunchActivity"
     tools:showIn="@layout/app_bar_launch">
 
     <ScrollView
+        android:id="@+id/sV"
         android:layout_width="match_parent"
-
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/adview"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
+
             <RelativeLayout
                 android:id="@+id/relsub"
                 android:layout_width="match_parent"
@@ -106,6 +111,7 @@
 
 
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/relsub2"
                 android:layout_width="match_parent"
@@ -188,4 +194,12 @@
         </LinearLayout>
     </ScrollView>
 
-</RelativeLayout>
+    <com.google.android.gms.ads.AdView
+        android:id="@+id/adview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        ads:adSize="SMART_BANNER"
+        ads:adUnitId="ca-app-pub-9668220491500664/9713891434" />
+</LinearLayout>