Skip to content

1.1 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 83 commits into
base: master
Choose a base branch
from
Open

1.1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
397ccb8
slider image added
santoshnet Jul 9, 2021
ae106ce
Merge branch 'master' into 1.1
santoshnet Jul 9, 2021
28b0d28
slider image added
santoshnet Jul 9, 2021
1cb75a6
otp varification screen added. and SignUpFragment.java and LoginFragm…
RohanPattnayak57 Jul 9, 2021
a32dc92
url changed
ashutoshquintus Jul 9, 2021
317846b
Merge remote-tracking branch 'origin/1.1' into 1.1
ashutoshquintus Jul 10, 2021
02416f4
login issuefixed , token stored in local storage
ashutoshquintus Jul 10, 2021
2cd5810
forgot password ,resend and reset api intigration done. otpVarificati…
RohanPattnayak57 Jul 10, 2021
868bcfc
category, userdetails, banner and apis added
ashutoshquintus Jul 11, 2021
87fd3a8
all payment getway added
santoshnet Jul 12, 2021
3872d04
Merge remote-tracking branch 'origin/1.1' into 1.1
santoshnet Jul 12, 2021
ddba362
otp verification and otp resend api intigration done.
RohanPattnayak57 Jul 13, 2021
2ba1850
otp verification and resend otp intigration done.
RohanPattnayak57 Jul 13, 2021
b6ef14e
emailid added to signup activity and registration issue solved
RohanPattnayak57 Jul 13, 2021
b6f3082
otp verification registered in manifest
ashutoshquintus Jul 13, 2021
d6d29b3
payment activity updated
santoshnet Jul 13, 2021
fb9365e
otp verification and resend otp api integration modified.
RohanPattnayak57 Jul 13, 2021
6bf5c5f
Merge remote-tracking branch 'origin/1.1' into 1.1
RohanPattnayak57 Jul 13, 2021
1101737
error utils added
ashutoshquintus Jul 13, 2021
0ecc260
Merge remote-tracking branch 'origin/1.1' into 1.1
ashutoshquintus Jul 13, 2021
688ac66
All api end points and tenant ids added
ashutoshquintus Jul 13, 2021
b0ba93e
models added
ashutoshquintus Jul 13, 2021
c43c23a
models added
ashutoshquintus Jul 14, 2021
384bf2d
addresslistActivity screen added
RohanPattnayak57 Jul 15, 2021
f5c0ae8
Merge remote-tracking branch 'origin/1.1' into 1.1
RohanPattnayak57 Jul 15, 2021
ffca47c
models added
ashutoshquintus Jul 15, 2021
257cf68
models added
ashutoshquintus Jul 15, 2021
0bb5696
homefragment updated
ashutoshquintus Jul 16, 2021
f42db1c
params added
ashutoshquintus Jul 16, 2021
713f8ae
duplicate import removed
ashutoshquintus Jul 16, 2021
289fd98
apis added
ashutoshquintus Jul 16, 2021
796edee
double backpress added
ashutoshquintus Jul 16, 2021
67bd7af
refactor ui
santoshnet Jul 17, 2021
873691f
product view api added
santoshnet Jul 17, 2021
9faf106
address api added. and modified
RohanPattnayak57 Jul 17, 2021
df168c8
Merge remote-tracking branch 'origin/1.1' into 1.1
RohanPattnayak57 Jul 17, 2021
2bb5d43
offer Advertisement Banner updated
ashutoshquintus Jul 17, 2021
78e1997
get country list fixed
ashutoshquintus Jul 17, 2021
6b55421
pagination added
ashutoshquintus Jul 20, 2021
4de0373
offers added
ashutoshquintus Jul 21, 2021
80812a7
orders added
ashutoshquintus Jul 22, 2021
d93f540
otp verify updated
santoshnet Jul 22, 2021
d621b9e
my orders changes
santoshnet Jul 23, 2021
ef1b1bc
category changes
ashutoshquintus Jul 23, 2021
07d824f
Merge remote-tracking branch 'origin/1.1' into 1.1
ashutoshquintus Jul 23, 2021
3e6c789
phone verify check and some changes
ashutoshquintus Jul 23, 2021
52e94df
Banner,Offer,Category updated
ashutoshquintus Jul 23, 2021
25b5c97
otp updated
ashutoshquintus Jul 24, 2021
9b12f3e
product updated
ashutoshquintus Jul 27, 2021
47aa12a
cart updated
ashutoshquintus Jul 27, 2021
eff5dd0
category screen updated
santoshnet Jul 28, 2021
64a9993
Address Updated
ashutoshquintus Jul 28, 2021
7f97b8d
Merge remote-tracking branch 'origin/1.1' into 1.1
ashutoshquintus Jul 28, 2021
8e5f0b6
offer screen changes
santoshnet Jul 29, 2021
fa6862c
Cart,Address Updated
ashutoshquintus Aug 1, 2021
e3f3cdf
Merge remote-tracking branch 'origin/1.1' into 1.1
ashutoshquintus Aug 1, 2021
d5511f9
Apis and ui Updated
ashutoshquintus Aug 9, 2021
df60911
Apis and ui Updated
ashutoshquintus Aug 16, 2021
5e4cab6
Apis and ui Updated
ashutoshquintus Aug 21, 2021
571ef6d
offline payment and razorpay gateway added
ashutoshquintus Aug 31, 2021
2c48e52
bugs fixed
ashutoshquintus Sep 1, 2021
6f538c3
bugs fixed
ashutoshquintus Sep 1, 2021
f7f7c5d
bugs fixed
ashutoshquintus Sep 1, 2021
7b7f05d
bugs fixed
ashutoshquintus Sep 1, 2021
11d6766
bugs fixed
ashutoshquintus Sep 1, 2021
46e6060
add to cart from subcategory products added
ashutoshquintus Sep 2, 2021
be03b23
category,Check promocode option,Navigation Changes,Order details scre…
ashutoshquintus Sep 3, 2021
f431857
After Coupon apply button disabled
ashutoshquintus Sep 3, 2021
5dc88c5
Cart Count issue on cart icon fixed
ashutoshquintus Sep 3, 2021
553ee7d
Cart Count and offer filtered updated
ashutoshquintus Sep 3, 2021
24649df
Forgot password updated
ashutoshquintus Sep 4, 2021
2372515
order details scroll fixed and remove applied coupon option added
ashutoshquintus Sep 4, 2021
7c4436f
Bugs Fixed
ashutoshquintus Sep 4, 2021
aef9946
Changes/Fixes
ashutoshquintus Sep 4, 2021
702cbb0
Changes/Fixes
ashutoshquintus Sep 6, 2021
9b7c87f
payu payment gateway added
ashutoshquintus Sep 11, 2021
f843f2e
code optimised
ashutoshquintus Sep 18, 2021
7a90f10
added tenant header
sibasisp Sep 19, 2021
ab78172
Moved tenant id to LocalappConfig
sibasisp Sep 20, 2021
1fde0f4
Added firebase auth to app
sibasisp Sep 20, 2021
0c5bcef
removed google json
sibasisp Sep 24, 2021
c6eb231
added google json to ignore file
sibasisp Sep 24, 2021
a776db4
APi changes to remove token from public apis
sibasisp Oct 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
.externalNativeBuild
'.idea'
'.idea'
/app/google-services.json
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 19 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 30
buildToolsVersion "30.0.2"
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.quintus.labs.grocerystore"
minSdkVersion 19
targetSdkVersion 29
minSdkVersion 21
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary true
vectorDrawables.useSupportLibrary true
}
buildTypes {
release {
Expand All @@ -23,7 +23,16 @@ allprojects {
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
mavenCentral()
maven {
url "https://jitpack.io"
}
maven {
url "https://s3-ap-southeast-1.amazonaws.com/godel-release/godel/"
}
maven {
url "https://dl.bintray.com/sasidhar-678/maven"
}
}
}

Expand All @@ -46,6 +55,11 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.firebase:firebase-messaging:20.1.5'
implementation 'com.google.firebase:firebase-analytics:17.3.0'
implementation 'com.razorpay:checkout:1.6.6'
implementation 'com.instamojo:android-sdk:+'
implementation 'com.payumoney.sdkui:plug-n-play:1.6.0'
implementation 'com.google.firebase:firebase-core:19.0.1'
implementation 'com.google.firebase:firebase-auth:21.0.1'

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0'
Expand Down
48 changes: 0 additions & 48 deletions app/google-services.json

This file was deleted.

30 changes: 25 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.quintus.labs.grocerystore">

<uses-permission android:name="android.permission.INTERNET" />
Expand All @@ -8,6 +9,9 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />

<application
android:allowBackup="true"
Expand All @@ -17,8 +21,23 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity android:name=".activity.SplashScreen"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup,android:usesCleartextTraffic">
<activity android:name=".activity.SubCategoryActivity"
android:configChanges="orientation|screenSize|keyboardHidden" />
<activity android:name=".activity.AddressListActivity" />
<activity android:name=".payment.payu.PayuPaymentActivity" />
<activity android:name=".activity.OtpVarificationActivity" />
<activity
android:name=".payment.instamojo.InstamojoPaymentActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".payment.razorpay.RazorPayPaymentActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activity.SplashScreen"
android:configChanges="orientation|screenSize|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -29,8 +48,7 @@
<activity
android:name=".activity.WelcomeActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="@string/app_name">
</activity>
android:label="@string/app_name" />
<activity
android:name=".activity.MainActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
Expand All @@ -42,7 +60,9 @@
<activity
android:name=".activity.LoginRegisterActivity"
android:configChanges="orientation|screenSize|keyboardHidden" />
<activity android:name=".activity.CartActivity" />
<activity android:name=".activity.CartActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
/>
<activity android:name=".activity.CheckoutActivity" />
<activity android:name=".activity.ProductViewActivity" />

Expand Down
Binary file removed app/src/main/assets/fonts/Chango-Regular.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/MavenPro-Regular.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/Merienda-Bold.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/Merienda-Regular.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/Molle-Regular.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OleoScript-Bold.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OleoScript-Regular.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OpenSans-Bold.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OpenSans-BoldItalic.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OpenSans-ExtraBold.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OpenSans-Light.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OpenSans-Regular.ttf
Binary file not shown.
Binary file removed app/src/main/assets/fonts/OpenSans-Semibold.ttf
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.quintus.labs.grocerystore.activity;

import androidx.appcompat.app.AppCompatActivity;

import android.annotation.SuppressLint;
import android.location.Address;
import android.os.Bundle;
import android.util.Log;
import android.widget.TextView;
import android.widget.Toast;

import com.google.gson.Gson;
import com.quintus.labs.grocerystore.R;
import com.quintus.labs.grocerystore.api.clients.RestClient;
import com.quintus.labs.grocerystore.model.AddAddress;
import com.quintus.labs.grocerystore.model.AddAddressListResponse;
import com.quintus.labs.grocerystore.model.User;
import com.quintus.labs.grocerystore.model.UserResponse;
import com.quintus.labs.grocerystore.util.ErrorUtils;
import com.quintus.labs.grocerystore.util.NetworkCheck;
import com.quintus.labs.grocerystore.util.localstorage.LocalStorage;

import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

public class AddressListActivity extends AppCompatActivity {
TextView address_name_display,address_phone_display,address_email_display,address_display,address_country_display,address_state_display,address_city_display,address_pincode_display,address_type_display;
String _country, _state, _city, _name, _email, _phone, _address, _zip, _address_type, userString;
LocalStorage localStorage;
Gson gson = new Gson();
User user;
AddAddress addAddress;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_address_list);

address_name_display = findViewById(R.id.address_name_display);
address_phone_display = findViewById(R.id.address_phone_display);
address_email_display = findViewById(R.id.address_email_display);
address_display =findViewById(R.id.address_display);
address_country_display =findViewById(R.id.address_country_display);
address_state_display =findViewById(R.id.address_state_display);
address_city_display =findViewById(R.id.address_city_display);
address_pincode_display =findViewById(R.id.address_pincode_display);
address_type_display =findViewById(R.id.address_type_display);

localStorage = new LocalStorage(getApplicationContext());
userString = localStorage.getUserLogin();
user = gson.fromJson(userString, User.class);
// token = "Bearer " + user.getToken();

if (NetworkCheck.isNetworkAvailable(getApplicationContext())) {
AddressDataList();
}
}

public void AddressDataList(){

// Call<AddAddressListResponse> call = RestClient.getRestService(getApplicationContext()).getAddressList(user);
// call.enqueue(new Callback<AddAddressListResponse>() {
// @Override
// public void onResponse(Call<AddAddressListResponse> call, Response<AddAddressListResponse> response) {
// AddAddressListResponse addressListResponse = response.body();
// if (addressListResponse != null) {
// if (response.code() == 200) {
// showData();
// }
//
// } else {
// Toast.makeText(getApplicationContext(), getResources().getString(R.string.label_something_went_wrong), Toast.LENGTH_LONG).show();
//
// }
// }
// @Override
// public void onFailure(Call<AddAddressListResponse> call, Throwable t) {
// Toast.makeText(getApplicationContext(), getResources().getString(R.string.please_try_after_sometime), Toast.LENGTH_LONG).show();
// }
// });
}

private void showData() {


}
}
Loading