fixed

GEC-Developers · Nov 14, 2018 · 13e9f66 · 13e9f66
1 parent b7f1c86
commit 13e9f66
Show file tree

Hide file tree

Showing 36 changed files with 172 additions and 181 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,10 +18,10 @@ repositories {
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "com.wedevelopapps.whatsappstatussaver"
+        applicationId "com.tripleastudio.whatsappstatussaver"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 1
+        versionCode 3
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -41,7 +41,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-crash:16.2.0'
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.android.gms:play-services-auth:16.0.0'
-    implementation 'com.google.android.gms:play-services-ads:15.0.1'
     implementation 'com.android.support:support-v4:27.1.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'

diff --git a/app/google-services.json b/app/google-services.json
@@ -10,15 +10,15 @@
       "client_info": {
         "mobilesdk_app_id": "1:617221212349:android:18a065df661bf73d",
         "android_client_info": {
-          "package_name": "com.wedevelopapps.whatsappstatussaver"
+          "package_name": "com.tripleastudio.whatsappstatussaver"
         }
       },
       "oauth_client": [
         {
           "client_id": "617221212349-rifp72br8iekjhetghvkanrm4tfsv5tf.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.wedevelopapps.whatsappstatussaver",
+            "package_name": "com.tripleastudio.whatsappstatussaver",
             "certificate_hash": "ab3a3788bb946eb5984ee556aa7c2ce84f2667be"
           }
         },

diff --git a/app/src/androidTest/java/com/tripleastudio/whatsappstatussaver/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/tripleastudio/whatsappstatussaver/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.wedevelopapps.whatsappstatussaver;
+package com.tripleastudio.whatsappstatussaver;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.wedevelopapps.whatsappstatussaver">
+    package="com.tripleastudio.whatsappstatussaver">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -13,16 +13,16 @@
         android:roundIcon="@drawable/icon"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".Activity.MainActivity">
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".Activity.InfoActivity" />
-        <activity android:name=".Activity.PicDetail" />
-        <activity android:name=".Activity.VideoDetailActivity" />
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.InfoActivity" />
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.PicDetail" />
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.VideoDetailActivity" />
 
         <meta-data
             android:name="io.fabric.ApiKey"
@@ -31,9 +31,9 @@
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="[ADMOB_APP_ID]" />
 
-        <activity android:name=".Activity.SavedGallery" />
-        <activity android:name=".Activity.ShowPictureItems" />
-        <activity android:name=".Activity.showVideoItems"></activity>
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.SavedGallery" />
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.ShowPictureItems" />
+        <activity android:name="com.tripleastudio.whatsappstatussaver.Activity.showVideoItems"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/InfoActivity.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/InfoActivity.java
@@ -8,11 +8,10 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.Toast;
 
 import com.romainpiel.shimmer.Shimmer;
 import com.romainpiel.shimmer.ShimmerTextView;
-import com.wedevelopapps.whatsappstatussaver.R;
+import com.tripleastudio.whatsappstatussaver.R;
 
 public class InfoActivity extends AppCompatActivity {
 

diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/MainActivity.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/MainActivity.java
@@ -4,14 +4,16 @@
 import android.app.AlarmManager;
 import android.app.Dialog;
 import android.app.PendingIntent;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.ActivityCompat;
@@ -21,8 +23,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import android.util.Base64;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -38,11 +38,9 @@
 import com.nightonke.boommenu.Util;
 import com.tripleastudio.whatsappstatussaver.Models.ListenableTabLayout;
 import com.tripleastudio.whatsappstatussaver.Models.TabIndicatorFollower;
-import com.tripleastudio.whatsappstatussaver.adapter.SelectionsPageAdapter;
-import com.wedevelopapps.whatsappstatussaver.R;
+import com.tripleastudio.whatsappstatussaver.R;
+import com.tripleastudio.whatsappstatussaver.SelectionsPageAdapter;
 
-import java.security.NoSuchAlgorithmException;
-import java.security.Signature;
 import java.util.ArrayList;
 
 import co.mobiwise.materialintro.shape.Focus;
@@ -147,7 +145,7 @@ public void onBoomButtonClick(int index) {
                             } else if (index == 1) {
                                 Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                                 sharingIntent.setType("text/plain");
-                                String shareBody = "Download WhatsApp Status using PLAYSTORE LINK";
+                                String shareBody = "Download WhatsApp Status Saver using https://play.google.com/store/apps/details?id=com.tripleastudio.whatsappstatussaver";
                                 sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, "Songs of Zion ");
                                 sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, shareBody);
                                 startActivity(Intent.createChooser(sharingIntent, "Share via"));
@@ -239,6 +237,7 @@ public void onBackPressed() {
     private void ratePopup() {
         rateUsPopUp.setContentView(R.layout.rate_us_pop_up);
         Button exitApp = rateUsPopUp.findViewById(R.id.exitApp);
+        Button rateUs = rateUsPopUp.findViewById(R.id.rateUs);
         LinearLayout cancel = rateUsPopUp.findViewById(R.id.cancelButton);
 
         exitApp.setOnClickListener(new View.OnClickListener() {
@@ -255,11 +254,41 @@ public void onClick(View v) {
             }
         });
 
+        rateUs.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                goToPlayStore();
+            }
+        });
+
         rateUsPopUp.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         rateUsPopUp.show();
 
     }
 
+    public void goToPlayStore() {
+        String playStoreMarketUrl = "market://details?id=";
+        String playStoreWebUrl = "https://play.google.com/store/apps/details?id=";
+        String packageName = getPackageName();
+        try {
+            Intent intent =
+                    getPackageManager()
+                            .getLaunchIntentForPackage("com.android.vending");
+            if (intent != null) {
+                ComponentName androidComponent = new ComponentName("com.android.vending",
+                        "com.google.android.finsky.activities.LaunchUrlHandlerActivity");
+                intent.setComponent(androidComponent);
+                intent.setData(Uri.parse(playStoreMarketUrl + packageName));
+            } else {
+                intent = new Intent(Intent.ACTION_VIEW, Uri.parse(playStoreMarketUrl + packageName));
+            }
+            startActivity(intent);
+        } catch (Resources.NotFoundException e) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(playStoreWebUrl + packageName));
+            startActivity(intent);
+        }
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/PicDetail.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/PicDetail.java
@@ -8,7 +8,6 @@
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -20,11 +19,9 @@
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.github.chrisbanes.photoview.PhotoView;
-import com.squareup.picasso.NetworkPolicy;
-import com.squareup.picasso.Picasso;
+import com.tripleastudio.whatsappstatussaver.R;
 import com.tripleastudio.whatsappstatussaver.adapter.CustomSliderAdapter;
-import com.wedevelopapps.whatsappstatussaver.R;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.comparator.LastModifiedFileComparator;
 
@@ -34,11 +31,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import co.mobiwise.materialintro.shape.Focus;
-import co.mobiwise.materialintro.shape.FocusGravity;
-import co.mobiwise.materialintro.shape.ShapeType;
-import co.mobiwise.materialintro.view.MaterialIntroView;
-
 public class PicDetail extends AppCompatActivity {
 
     ImageView backArrow;

diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/SavedGallery.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/SavedGallery.java
@@ -8,8 +8,9 @@
 
 import com.tripleastudio.whatsappstatussaver.Models.ListenableTabLayout;
 import com.tripleastudio.whatsappstatussaver.Models.TabIndicatorFollower;
+import com.tripleastudio.whatsappstatussaver.R;
 import com.tripleastudio.whatsappstatussaver.adapter.SavedGalleryAdapter;
-import com.wedevelopapps.whatsappstatussaver.R;
+
 public class SavedGallery extends AppCompatActivity {
 
     private Toolbar mToolBar;

diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/ShowPictureItems.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/ShowPictureItems.java
@@ -16,8 +16,8 @@
 import android.widget.Toast;
 
 
+import com.tripleastudio.whatsappstatussaver.R;
 import com.tripleastudio.whatsappstatussaver.adapter.CustomSliderAdapter;
-import com.wedevelopapps.whatsappstatussaver.R;
 
 import org.apache.commons.io.comparator.LastModifiedFileComparator;
 

diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/VideoDetailActivity.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/VideoDetailActivity.java
@@ -2,35 +2,27 @@
 
 import android.content.ContentValues;
 import android.content.Intent;
-import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.MediaController;
 import android.widget.Toast;
 import android.widget.VideoView;
 
-import com.wedevelopapps.whatsappstatussaver.R;
+import com.tripleastudio.whatsappstatussaver.R;
 
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 
-import co.mobiwise.materialintro.shape.Focus;
-import co.mobiwise.materialintro.shape.FocusGravity;
-import co.mobiwise.materialintro.shape.ShapeType;
-import co.mobiwise.materialintro.view.MaterialIntroView;
-
 public class VideoDetailActivity extends AppCompatActivity {
 
     VideoView videoView;

diff --git a/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/showVideoItems.java b/app/src/main/java/com/tripleastudio/whatsappstatussaver/Activity/showVideoItems.java
@@ -1,14 +1,12 @@
 package com.tripleastudio.whatsappstatussaver.Activity;
 
 import android.content.Intent;
-import android.media.MediaPlayer;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
@@ -17,7 +15,7 @@
 import android.widget.VideoView;
 
 
-import com.wedevelopapps.whatsappstatussaver.R;
+import com.tripleastudio.whatsappstatussaver.R;
 
 import java.io.File;