diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index b09cd785..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/WebPanel/app/.DS_Store b/WebPanel/app/.DS_Store
deleted file mode 100644
index 4c1099a6..00000000
Binary files a/WebPanel/app/.DS_Store and /dev/null differ
diff --git a/app/app.iml b/app/app.iml
index 374736eb..7d70c3a7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -4,8 +4,8 @@
-
-
+
+
@@ -30,16 +30,16 @@
-
+
+
-
+
-
-
+
@@ -86,7 +86,7 @@
-
+
@@ -94,31 +94,33 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
@@ -126,13 +128,14 @@
+
-
-
-
+
+
+
@@ -142,44 +145,48 @@
-
+
-
+
+
-
+
-
-
-
+
+
+
+
+
-
-
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -198,40 +205,48 @@
-
-
+
+
+
+
+
-
+
+
+
-
+
-
-
-
+
+
+
+
+
-
-
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index f9c88127..edf455fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,17 +6,15 @@ android {
javaMaxHeapSize "4g"
preDexLibraries false
}
- compileSdkVersion 29
- buildToolsVersion '29.0.3'
-
+ compileSdkVersion 30
defaultConfig {
vectorDrawables.useSupportLibrary = true
vectorDrawables {
useSupportLibrary = true
}
- applicationId "com.vimalcvs.stickers_app"
+ applicationId "com.virmana.stickers_app"
minSdkVersion 16
- targetSdkVersion 29
+ targetSdkVersion 30
multiDexEnabled true
versionCode 100
versionName "1.0"
@@ -24,12 +22,9 @@ android {
vectorDrawables.useSupportLibrary = true
def contentProviderAuthority = applicationId + ".provider.StickerContentProvider"
// Creates a placeholder property to use in the manifest.
- manifestPlaceholders =
- [contentProviderAuthority: contentProviderAuthority]
+ manifestPlaceholders = [contentProviderAuthority: contentProviderAuthority]
// Adds a new field for the authority to the BuildConfig class.
- buildConfigField("String",
- "CONTENT_PROVIDER_AUTHORITY",
- "\"${contentProviderAuthority}\"")
+ buildConfigField("String", "CONTENT_PROVIDER_AUTHORITY", "\"${contentProviderAuthority}\"")
}
buildTypes {
release {
@@ -55,47 +50,50 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
+ implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.13'
- androidTestImplementation 'androidx.test:runner:1.3.0-rc01'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc01'
- implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04'
+ androidTestImplementation 'androidx.test:runner:1.3.1-alpha02'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha02'
+ implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha06'
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.orhanobut:hawk:2.0.1'
implementation 'androidx.multidex:multidex:2.0.1'
- implementation 'com.google.android.material:material:1.3.0-alpha01'
+ implementation 'com.google.android.material:material:1.3.0-alpha03'
implementation 'com.github.siyamed:android-shape-imageview:0.9.3@aar'
- implementation 'com.google.code.gson:gson:2.8.5'
- implementation 'com.squareup.retrofit2:retrofit:2.8.1'
- implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
- implementation 'com.squareup.okhttp3:okhttp:4.5.0'
+ implementation 'com.google.code.gson:gson:2.8.6'
+ implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+ implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+ implementation 'com.squareup.okhttp3:okhttp:4.9.0'
implementation 'com.jakewharton.timber:timber:4.7.1'
- implementation 'com.squareup.okhttp3:logging-interceptor:4.5.0'
+ implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
- implementation 'com.squareup.picasso:picasso:2.5.2'
- implementation 'com.anjlab.android.iab.v3:library:1.0.44'
+ implementation 'com.squareup.picasso:picasso:2.71828'
+ implementation 'com.anjlab.android.iab.v3:library:1.1.0'
implementation 'com.facebook.android:facebook-android-sdk:5.15.3'
- implementation 'com.facebook.android:audience-network-sdk:5.7.0'
+ implementation 'com.facebook.android:audience-network-sdk:5.11.0'
implementation 'com.github.vivchar:ViewPagerIndicator:1.1.0'
implementation 'com.github.GrenderG:Toasty:1.4.2'
implementation 'devlight.io:navigationtabbar:1.2.5'
implementation 'com.miguelcatalan:materialsearchview:1.4.0'
- implementation 'com.google.firebase:firebase-auth:19.3.2'
- implementation 'com.google.android.gms:play-services-auth:18.0.0'
- implementation 'com.google.firebase:firebase-core:17.4.4'
- implementation 'com.google.firebase:firebase-messaging:20.2.2'
- implementation 'com.google.firebase:firebase-ads:19.2.0'
+ implementation 'com.google.firebase:firebase-auth:20.0.0'
+ implementation 'com.google.android.gms:play-services-auth:18.1.0'
+ implementation 'com.google.firebase:firebase-core:18.0.0'
+ implementation 'com.google.firebase:firebase-messaging:21.0.0'
+ implementation 'com.google.firebase:firebase-ads:19.5.0'
implementation 'org.apache.commons:commons-io:1.3.2'
implementation 'com.google.android.ads.consent:consent-library:1.0.8'
implementation 'com.alexvasilkov:gesture-views:2.5.2'
//background remover
+ //Gradle Dependency
+ implementation 'com.github.vimalcvs:Material-Smart-Rating:1.0.3'
+ implementation 'com.github.vimalcvs:Day-Night-Switch:1.0.3'
implementation 'com.github.duanhong169:checkerboarddrawable:1.0.2'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'com.alexvasilkov:gesture-views:2.5.2'
implementation 'com.github.jkwiecien:EasyImage:1.3.1'
- implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04'
+ implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha06'
implementation 'com.gauravk.bubblenavigation:bubblenavigation:1.0.7'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
implementation 'com.github.joielechong:countrycodepicker:2.4.1'
diff --git a/app/google-services.json b/app/google-services.json
index 08efdaf0..11514508 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -54,7 +54,7 @@
"client_info": {
"mobilesdk_app_id": "1:690266354741:android:e7140ddbb1cd8675",
"android_client_info": {
- "package_name": "com.vimalcvs.ringtone_app"
+ "package_name": "com.virmana.ringtone_app"
}
},
"oauth_client": [
@@ -62,7 +62,7 @@
"client_id": "690266354741-2utio6a1p8ln1cojh8nh9iuqns9vesqh.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
- "package_name": "com.vimalcvs.ringtone_app",
+ "package_name": "com.virmana.ringtone_app",
"certificate_hash": "0f07403727f1c7e897ddf43fbbedecb06b59acd6"
}
},
@@ -70,7 +70,7 @@
"client_id": "690266354741-lpcs70icfaat2pdgu4dgekf5k91upug2.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
- "package_name": "com.vimalcvs.ringtone_app",
+ "package_name": "com.virmana.ringtone_app",
"certificate_hash": "976f75958dd7b0550a420e522d849c6084dafddc"
}
},
@@ -78,7 +78,7 @@
"client_id": "690266354741-de2c0t2qqv2pjf3geuqbh8afq179pami.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
- "package_name": "com.vimalcvs.ringtone_app",
+ "package_name": "com.virmana.ringtone_app",
"certificate_hash": "6faf28510e347c3b61e9d0deb7b43a95d89e1f7b"
}
},
@@ -114,7 +114,7 @@
"client_info": {
"mobilesdk_app_id": "1:690266354741:android:6d6d9163bbfcbdec",
"android_client_info": {
- "package_name": "com.vimalcvs.status_video"
+ "package_name": "com.virmana.status_video"
}
},
"oauth_client": [
@@ -145,7 +145,7 @@
"client_info": {
"mobilesdk_app_id": "1:690266354741:android:20e15d13aad1a001",
"android_client_info": {
- "package_name": "com.vimalcvs.stickers_app"
+ "package_name": "com.virmana.stickers_app"
}
},
"oauth_client": [
diff --git a/app/src/androidTest/java/com/vimalcvs/stickers_app/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/virmana/stickers_app/ExampleInstrumentedTest.java
similarity index 84%
rename from app/src/androidTest/java/com/vimalcvs/stickers_app/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/virmana/stickers_app/ExampleInstrumentedTest.java
index 539436c1..41213567 100644
--- a/app/src/androidTest/java/com/vimalcvs/stickers_app/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/virmana/stickers_app/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.vimalcvs.stickers_app;
+package com.virmana.stickers_app;
import android.content.Context;
import androidx.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
- assertEquals("com.vimalcvs.stickers", appContext.getPackageName());
+ assertEquals("com.virmana.stickers", appContext.getPackageName());
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd1d0574..b4af6044 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
+ package="com.virmana.stickers_app">
@@ -67,7 +67,7 @@
+ android:value="com.virmana.stickers_app.MainActivity" />
+
+
@@ -123,6 +125,7 @@
+
diff --git a/WebPanel/app/cache/.DS_Store b/app/src/main/assets/.DS_Store
similarity index 100%
rename from WebPanel/app/cache/.DS_Store
rename to app/src/main/assets/.DS_Store
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 00000000..909c3f2b
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/editor/editimage/view/Constants.java b/app/src/main/java/com/vimalcvs/stickers_app/editor/editimage/view/Constants.java
deleted file mode 100644
index 94d4cf12..00000000
--- a/app/src/main/java/com/vimalcvs/stickers_app/editor/editimage/view/Constants.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vimalcvs.stickers_app.editor.editimage.view;
-
-
-/**
- * Created by vimalcvs on 27/11/2017.
- */
-public class Constants {
- public static final int STICKER_BTN_HALF_SIZE = 30;
-}
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/editor/editimage/view/imagezoom/utils/IDisposable.java b/app/src/main/java/com/vimalcvs/stickers_app/editor/editimage/view/imagezoom/utils/IDisposable.java
deleted file mode 100644
index d513dad4..00000000
--- a/app/src/main/java/com/vimalcvs/stickers_app/editor/editimage/view/imagezoom/utils/IDisposable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vimalcvs.stickers_app.editor.editimage.view.imagezoom.utils;
-
-public interface IDisposable {
- void dispose();
-}
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/editor/picchooser/GridItem.java b/app/src/main/java/com/vimalcvs/stickers_app/editor/picchooser/GridItem.java
deleted file mode 100644
index 1bb37c4a..00000000
--- a/app/src/main/java/com/vimalcvs/stickers_app/editor/picchooser/GridItem.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.vimalcvs.stickers_app.editor.picchooser;
-
-class GridItem {
- final String name;
- final String path;
- final String imageTaken;
- final long imageSize;
- public GridItem(final String n, final String p,final String imageTaken,final long imageSize) {
- name = n;
- path = p;
- this.imageTaken = imageTaken;
- this.imageSize = imageSize;
- }
-}
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/editor/picchooser/SquareImageView.java b/app/src/main/java/com/vimalcvs/stickers_app/editor/picchooser/SquareImageView.java
deleted file mode 100644
index 3509db59..00000000
--- a/app/src/main/java/com/vimalcvs/stickers_app/editor/picchooser/SquareImageView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.vimalcvs.stickers_app.editor.picchooser;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-/**
- * 正方形的ImageView 强制 宽度 = 高度
- *
- */
-public class SquareImageView extends ImageView {
-
- public SquareImageView(final Context context, final AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- setMeasuredDimension(getMeasuredWidth(), getMeasuredWidth());
- }
-}//end class
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/Application.java b/app/src/main/java/com/virmana/stickers_app/Application.java
similarity index 67%
rename from app/src/main/java/com/vimalcvs/stickers_app/Application.java
rename to app/src/main/java/com/virmana/stickers_app/Application.java
index 0671593b..d1cac340 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/Application.java
+++ b/app/src/main/java/com/virmana/stickers_app/Application.java
@@ -1,4 +1,19 @@
-package com.vimalcvs.stickers_app;
+/*
+ * Copyright 2020 Vimal CVS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.virmana.stickers_app;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -11,6 +26,9 @@
import com.orhanobut.hawk.Hawk;
import timber.log.Timber;
+/**
+ * Created by Vimal-CVS on 04/11/2020.
+ */
public class Application extends MultiDexApplication {
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/MainActivity.java b/app/src/main/java/com/virmana/stickers_app/MainActivity.java
similarity index 92%
rename from app/src/main/java/com/vimalcvs/stickers_app/MainActivity.java
rename to app/src/main/java/com/virmana/stickers_app/MainActivity.java
index 4d91fa44..436e03ba 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/MainActivity.java
+++ b/app/src/main/java/com/virmana/stickers_app/MainActivity.java
@@ -1,4 +1,19 @@
-package com.vimalcvs.stickers_app;
+/*
+ * Copyright 2020 Vimal CVS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.virmana.stickers_app;
import android.Manifest;
import android.content.pm.PackageManager;
@@ -12,14 +27,14 @@
import android.util.Log;
import android.widget.Toast;
-import com.vimalcvs.stickers_app.api.apiClient;
-import com.vimalcvs.stickers_app.api.apiRest;
-import com.vimalcvs.stickers_app.entity.PackApi;
-import com.vimalcvs.stickers_app.entity.StickerApi;
+import com.virmana.stickers_app.api.apiClient;
+import com.virmana.stickers_app.api.apiRest;
+import com.virmana.stickers_app.entity.PackApi;
+import com.virmana.stickers_app.entity.StickerApi;
import com.orhanobut.hawk.Hawk;
-import com.vimalcvs.stickers_app.adapter.StickerAdapter;
-import com.vimalcvs.stickers_app.model.StickerModel;
-import com.vimalcvs.stickers_app.task.GetStickers;
+import com.virmana.stickers_app.adapter.StickerAdapter;
+import com.virmana.stickers_app.model.StickerModel;
+import com.virmana.stickers_app.task.GetStickers;
import org.json.JSONArray;
import org.json.JSONException;
@@ -34,6 +49,9 @@
import retrofit2.Callback;
import retrofit2.Response;
import retrofit2.Retrofit;
+/**
+ * Created by Vimal-CVS on 04/11/2020.
+ */
public class MainActivity extends AppCompatActivity implements GetStickers.Callbacks {
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/Manager/PrefManager.java b/app/src/main/java/com/virmana/stickers_app/Manager/PrefManager.java
similarity index 97%
rename from app/src/main/java/com/vimalcvs/stickers_app/Manager/PrefManager.java
rename to app/src/main/java/com/virmana/stickers_app/Manager/PrefManager.java
index c94072a6..6f23b113 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/Manager/PrefManager.java
+++ b/app/src/main/java/com/virmana/stickers_app/Manager/PrefManager.java
@@ -1,4 +1,4 @@
-package com.vimalcvs.stickers_app.Manager;
+package com.virmana.stickers_app.Manager;
import android.content.Context;
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/Sticker.java b/app/src/main/java/com/virmana/stickers_app/Sticker.java
similarity index 68%
rename from app/src/main/java/com/vimalcvs/stickers_app/Sticker.java
rename to app/src/main/java/com/virmana/stickers_app/Sticker.java
index 4378612b..da902bc0 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/Sticker.java
+++ b/app/src/main/java/com/virmana/stickers_app/Sticker.java
@@ -1,9 +1,27 @@
-package com.vimalcvs.stickers_app;
+/*
+ * Copyright 2020 Vimal CVS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.virmana.stickers_app;
- import android.os.Parcel;
+import android.os.Parcel;
import android.os.Parcelable;
import java.util.List;
+/**
+ * Created by Vimal-CVS on 04/11/2020.
+ */
public class Sticker implements Parcelable {
public String imageFileUrl;
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/StickerPack.java b/app/src/main/java/com/virmana/stickers_app/StickerPack.java
similarity index 89%
rename from app/src/main/java/com/vimalcvs/stickers_app/StickerPack.java
rename to app/src/main/java/com/virmana/stickers_app/StickerPack.java
index 32b3f8ba..89e5dd87 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/StickerPack.java
+++ b/app/src/main/java/com/virmana/stickers_app/StickerPack.java
@@ -1,11 +1,29 @@
-package com.vimalcvs.stickers_app;
+/*
+ * Copyright 2020 Vimal CVS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.virmana.stickers_app;
import android.os.Parcel;
import android.os.Parcelable;
-import com.vimalcvs.stickers_app.entity.PackApi;
+import com.virmana.stickers_app.entity.PackApi;
import java.util.List;
+/**
+ * Created by Vimal-CVS on 04/11/2020.
+ */
public class StickerPack implements Parcelable {
public String identifier;
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/adapter/CategoryAdapter.java b/app/src/main/java/com/virmana/stickers_app/adapter/CategoryAdapter.java
similarity index 94%
rename from app/src/main/java/com/vimalcvs/stickers_app/adapter/CategoryAdapter.java
rename to app/src/main/java/com/virmana/stickers_app/adapter/CategoryAdapter.java
index 777aca9c..71879a7e 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/adapter/CategoryAdapter.java
+++ b/app/src/main/java/com/virmana/stickers_app/adapter/CategoryAdapter.java
@@ -1,4 +1,4 @@
-package com.vimalcvs.stickers_app.adapter;
+package com.virmana.stickers_app.adapter;
import android.app.Activity;
import android.content.Intent;
@@ -14,10 +14,10 @@
import android.widget.ImageView;
import android.widget.TextView;
-import com.vimalcvs.stickers_app.R;
-import com.vimalcvs.stickers_app.ui.CategoryActivity;
-import com.vimalcvs.stickers_app.entity.CategoryApi;
-import com.vimalcvs.stickers_app.entity.TagApi;
+import com.virmana.stickers_app.R;
+import com.virmana.stickers_app.ui.CategoryActivity;
+import com.virmana.stickers_app.entity.CategoryApi;
+import com.virmana.stickers_app.entity.TagApi;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
@@ -26,7 +26,7 @@
import java.util.TreeMap;
/**
- * Created by Vimal on 17/01/2018.
+ * Created by Vimal-CVS on 04/11/2020.
*/
public class CategoryAdapter extends RecyclerView.Adapter {
@@ -95,7 +95,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position)
categoryHolder.text_view_item_category.setText(categoryList.get(position).getTitle());
categoryHolder.text_view_item_category_shadow.setText(categoryList.get(position).getTitle());
- Picasso.with(activity.getApplicationContext()).load(categoryList.get(position).getImage()).into(((CategoryHolder) holder).image_view_item_category);
+ Picasso.get().load(categoryList.get(position).getImage()).into(((CategoryHolder) holder).image_view_item_category);
categoryHolder.text_view_item_category.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -150,7 +150,7 @@ public void onClick(View view) {
categoryHolder.text_view_item_category.setText(categoryList.get(position).getTitle());
categoryHolder.text_view_item_category_counter.setText(format(categoryList.get(position).getPacks())+" packs");
- Picasso.with(activity.getApplicationContext()).load(categoryList.get(position).getImage()).into(((CategoryMiniHolder) holder).image_view_item_category);
+ Picasso.get().load(categoryList.get(position).getImage()).into(((CategoryMiniHolder) holder).image_view_item_category);
categoryHolder.text_view_item_category.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/adapter/CategorySelectAdapter.java b/app/src/main/java/com/virmana/stickers_app/adapter/CategorySelectAdapter.java
similarity index 95%
rename from app/src/main/java/com/vimalcvs/stickers_app/adapter/CategorySelectAdapter.java
rename to app/src/main/java/com/virmana/stickers_app/adapter/CategorySelectAdapter.java
index c6ee0b6c..7933681e 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/adapter/CategorySelectAdapter.java
+++ b/app/src/main/java/com/virmana/stickers_app/adapter/CategorySelectAdapter.java
@@ -1,4 +1,4 @@
-package com.vimalcvs.stickers_app.adapter;
+package com.virmana.stickers_app.adapter;
import android.app.Activity;
import androidx.recyclerview.widget.RecyclerView;
@@ -7,12 +7,14 @@
import android.view.View;
import android.view.ViewGroup;
-import com.vimalcvs.stickers_app.R;
-import com.vimalcvs.stickers_app.entity.CategoryApi;
+import com.virmana.stickers_app.R;
+import com.virmana.stickers_app.entity.CategoryApi;
import java.util.ArrayList;
import java.util.List;
-
+/**
+ * Created by Vimal-CVS on 04/11/2020.
+ */
public class CategorySelectAdapter extends RecyclerView.Adapter implements SelectableCategoryViewHolder.OnItemSelectedListener {
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/adapter/FollowAdapter.java b/app/src/main/java/com/virmana/stickers_app/adapter/FollowAdapter.java
similarity index 75%
rename from app/src/main/java/com/vimalcvs/stickers_app/adapter/FollowAdapter.java
rename to app/src/main/java/com/virmana/stickers_app/adapter/FollowAdapter.java
index 75b09fc4..044662d7 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/adapter/FollowAdapter.java
+++ b/app/src/main/java/com/virmana/stickers_app/adapter/FollowAdapter.java
@@ -1,4 +1,4 @@
-package com.vimalcvs.stickers_app.adapter;
+package com.virmana.stickers_app.adapter;
import android.app.Activity;
@@ -12,13 +12,15 @@
import android.widget.TextView;
import com.github.siyamed.shapeimageview.CircularImageView;
-import com.vimalcvs.stickers_app.R;
-import com.vimalcvs.stickers_app.ui.UserActivity;
-import com.vimalcvs.stickers_app.entity.UserApi;
+import com.virmana.stickers_app.R;
+import com.virmana.stickers_app.ui.UserActivity;
+import com.virmana.stickers_app.entity.UserApi;
import com.squareup.picasso.Picasso;
import java.util.List;
-
+/**
+ * Created by Vimal-CVS on 04/11/2020.
+ */
public class FollowAdapter extends RecyclerView.Adapter{
private List userList;
private Activity activity;
@@ -39,11 +41,11 @@ public void onBindViewHolder(ColorHolder holder,final int position) {
Log.v("WE ARE ONE","FollowAdapter");
if (!userList.get(position).getImage().isEmpty()){
- Picasso.with(activity).load(userList.get(position).getImage()).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_follow_iten);
- Picasso.with(activity).load(userList.get(position).getImage()).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_item_subscribe_thum);
+ Picasso.get().load(userList.get(position).getImage()).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_follow_iten);
+ Picasso.get().load(userList.get(position).getImage()).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_item_subscribe_thum);
}else{
- Picasso.with(activity).load(R.drawable.profile).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_follow_iten);
- Picasso.with(activity).load(R.drawable.profile).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_item_subscribe_thum);
+ Picasso.get().load(R.drawable.profile).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_follow_iten);
+ Picasso.get().load(R.drawable.profile).error(R.drawable.profile).placeholder(R.drawable.profile).into(holder.image_view_item_subscribe_thum);
}
holder.text_view_follow_itme_label.setText(userList.get(position).getLabel());
holder.image_view_follow_iten.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/vimalcvs/stickers_app/adapter/IntroAdapter.java b/app/src/main/java/com/virmana/stickers_app/adapter/IntroAdapter.java
similarity index 95%
rename from app/src/main/java/com/vimalcvs/stickers_app/adapter/IntroAdapter.java
rename to app/src/main/java/com/virmana/stickers_app/adapter/IntroAdapter.java
index b9f9e2a3..ecdc98b6 100644
--- a/app/src/main/java/com/vimalcvs/stickers_app/adapter/IntroAdapter.java
+++ b/app/src/main/java/com/virmana/stickers_app/adapter/IntroAdapter.java
@@ -1,4 +1,4 @@
-package com.vimalcvs.stickers_app.adapter;
+package com.virmana.stickers_app.adapter;
import android.content.Context;
import android.os.Parcelable;
@@ -8,16 +8,14 @@
import android.view.View;
import android.view.ViewGroup;
-import com.vimalcvs.stickers_app.R;
+import com.virmana.stickers_app.R;
import java.util.ArrayList;
import java.util.List;
-
/**
- * Created by Vimal on 28/11/2017.
+ * Created by Vimal-CVS on 04/11/2020.
*/
-
public class IntroAdapter extends PagerAdapter {
private List