Skip to content
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

San branch #88

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6ae2a0a
Swipe Refresh in ManagerInvoiceFragment and Screen Issues
jeevansurendran Mar 2, 2020
9f25491
ref: UploadCallback interface now has ApiResponse to better work with…
shivanshs9 Mar 2, 2020
584859d
Added Delimiter for cuisines in NearbyRestaurants and implemented des…
jeevansurendran Feb 25, 2020
ab25e31
Partially converted NearbyRestaurants to Epoxy
jeevansurendran Feb 26, 2020
97e15cf
NearbyRestaurant layout orientation fixed
jeevansurendran Feb 26, 2020
e986aab
Restaurant opening and closing
jeevansurendran Feb 29, 2020
c09cf1b
Removed an extra Logs and Toasts
jeevansurendran Mar 1, 2020
fca7dda
Added Util Function for opening
jeevansurendran Mar 1, 2020
e450582
ui: Fixed open/close in nearby restaurants
shivanshs9 Mar 2, 2020
1183dd6
Partial LocationSwitching
jeevansurendran Mar 4, 2020
2cd6cb8
Viewmodel issues fixed
jeevansurendran Mar 5, 2020
a4838b6
LocationSwitchingScreen Implemented
jeevansurendran Mar 5, 2020
1e7efd5
Removed @+id in some places
jeevansurendran Mar 5, 2020
93b3321
Filtering the restaurants based on CityID
jeevansurendran Mar 7, 2020
60793c3
Fixed Small Issues
jeevansurendran Mar 7, 2020
8666a5c
Added permissions for switch-location
jeevansurendran Mar 14, 2020
5a803fc
Fixed Minor Changes
jeevansurendran Mar 15, 2020
6427b98
Fixed bugs in location switch fragment
shivanshs9 Mar 15, 2020
b129b86
PaymentTransactionActivity for past transactions.
jeevansurendran Mar 8, 2020
dc79bba
ClosedOrderDetails and Transaction
jeevansurendran Mar 12, 2020
fecd9dc
Fixed Minor errors in ClosedTransaction
jeevansurendran Mar 13, 2020
d4b73b1
#83 (comment) fixed and other bugs too
jeevansurendran Mar 15, 2020
9083419
Better Formatting for session and serving time
jeevansurendran Mar 15, 2020
e418076
Reduced the size of formatted text to support small mobiles
jeevansurendran Mar 15, 2020
686607e
Merged PR #82, #83 with fixes
shivanshs9 Mar 16, 2020
d395ee4
Google Play
jeevansurendran Mar 15, 2020
060cf5c
RestaurantOrderRemarks layout Fixed
jeevansurendran Mar 15, 2020
f65fc72
Added locality to ScheduledSessionCart
jeevansurendran Mar 15, 2020
68b20d5
QSR Food ready uses closed session details endpoint
shivanshs9 Mar 16, 2020
ef7e981
RazorPay PaymentGateway Partially Implemented
jeevansurendran Feb 6, 2020
1b801b3
Custom Payment UI fixed and option models added
shivanshs9 Mar 18, 2020
91aea7b
Switched to Razorpay again
shivanshs9 Mar 20, 2020
d2bd786
Razorpay payment done
shivanshs9 Mar 23, 2020
e39775a
Added App Build Type Analytics User Property
shivanshs9 Mar 23, 2020
39357fc
Added Proguard rules for Razorpay
shivanshs9 Mar 23, 2020
030b6c2
UI fixes (#85)
jeevansurendran Mar 19, 2020
dbe507a
Created tooltip to give mroe information about GST
jeevansurendran Mar 20, 2020
7c32303
Moved Tax Details to BillHolder
jeevansurendran Mar 20, 2020
a2d47de
Closing tooltip if cart is closed
jeevansurendran Mar 21, 2020
e222f84
Dummy email in razorpay
shivanshs9 Mar 23, 2020
dcc0159
Update PublicRestaurantProfileActivity.kt
sanyud24 Sep 3, 2020
d2e6413
Update PublicRestaurantProfileActivity.kt
sanyud24 Sep 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
164 changes: 164 additions & 0 deletions .idea/navEditor.xml

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

50 changes: 36 additions & 14 deletions app/build.gradle
Expand Up @@ -6,6 +6,7 @@ apply plugin: 'io.objectbox'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'io.fabric'
apply from: '../versions.gradle'
apply plugin: "androidx.navigation.safeargs.kotlin"

def keystoreProperties = new Properties()
// Load your keystore.properties file into the keystoreProperties object.
Expand Down Expand Up @@ -69,6 +70,9 @@ android {
targetCompatibility 1.8
sourceCompatibility 1.8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
flavorDimensions "feature"
productFlavors {
extra {
Expand Down Expand Up @@ -97,20 +101,20 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"

// Android KTX
implementation (
implementation(
"androidx.core:core-ktx:$versions.ktx",
"androidx.fragment:fragment-ktx:$versions.ktx"
)

// Lifecycle Android KTX
implementation (
implementation(
"androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle",
"androidx.lifecycle:lifecycle-runtime-ktx:$versions.lifecycle",
"androidx.lifecycle:lifecycle-livedata-ktx:$versions.lifecycle",
)

// AndroidX libraries
implementation (
implementation(
"androidx.legacy:legacy-support-v4:1.0.0",
"androidx.core:core:1.1.0",
"androidx.constraintlayout:constraintlayout:1.1.3",
Expand Down Expand Up @@ -141,26 +145,26 @@ dependencies {

// OkHttp3
//noinspection GradleDependency
implementation (
implementation(
"com.squareup.okhttp3:okhttp:$versions.okhttp",
"com.squareup.okhttp3:logging-interceptor:$versions.okhttp"
)

// Play Services
implementation (
implementation(
"com.google.android.gms:play-services-auth:$versions.playService",
// Google Maps
"com.google.android.gms:play-services-maps:$versions.playService",
"com.google.android.gms:play-services-location:$versions.playService"
"com.google.android.gms:play-services-location:$versions.playService",
)

// Google Places API
implementation "com.google.android.libraries.places:places:2.1.0"
implementation "com.google.android.libraries.places:places:2.2.0"
// Google Material
implementation "com.google.android.material:material:1.2.0-alpha04"
implementation "com.google.android.material:material:1.2.0-alpha05"

// FireBase libraries
implementation (
implementation(
"com.google.firebase:firebase-common-ktx:19.3.0",
"com.google.firebase:firebase-auth:19.2.0",
"com.google.firebase:firebase-messaging:20.1.0",
Expand All @@ -172,16 +176,24 @@ dependencies {
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"

// Facebook SDK
implementation (
implementation(
"com.facebook.android:facebook-android-sdk:$versions.facebook",
"com.facebook.android:facebook-login:$versions.facebook"
)

// Navigation Component
implementation(
"androidx.navigation:navigation-fragment-ktx:$versions.navigation",
"androidx.navigation:navigation-ui-ktx:$versions.navigation"
)

// Glide
implementation (
implementation(
"com.github.bumptech.glide:glide:$versions.glide",
"jp.wasabeef:glide-transformations:4.1.0"
)
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
kapt "com.github.bumptech.glide:compiler:$versions.glide"

// QR Scanner
Expand Down Expand Up @@ -212,16 +224,23 @@ dependencies {
implementation "com.yarolegovich:discrete-scrollview:1.4.9"
implementation "com.appyvet:materialrangebar:1.4.4"
implementation "com.github.antonygolovin:fluentsnackbar:1.0.0"
implementation "com.github.adrielcafe:PageIndicatorView:1.0.6" // original library doesn't support ViewPager2
// original PageIndicatorView library doesn't support ViewPager2
implementation "com.github.adrielcafe:PageIndicatorView:1.0.6"
implementation "com.lyft:scissors:1.1.1"
implementation "com.borjabravo:readmoretextview:2.1.0"
implementation "com.wdullaer:materialdatetimepicker:4.2.3"
implementation "com.redmadrobot:input-mask-android:6.0.0"

// Onboarding Screens
implementation "com.getkeepsafe.taptargetview:taptargetview:1.12.0"

// PayTM sdk
implementation ("com.paytm:pgplussdk:$versions.paytm") { transitive = true }
// Razorpay Payment SDK
implementation(name: "razorpay-android-3.8.8", ext: 'aar')
// Native Google Pay support
implementation(name: "tez-client-api-0.9.4", ext: 'aar')
implementation(name: "razorpay-googlepay-1.3.0", ext: 'aar')
// Legacy Paytm SDK
implementation("com.paytm:pgplussdk:$versions.paytm") { transitive = true }

// Shimmering Effects
implementation "com.facebook.shimmer:shimmer:0.5.0"
Expand All @@ -234,6 +253,9 @@ dependencies {
// Material Drawer
implementation 'co.zsmb:materialdrawer-kt:3.0.0'

// Balloon
implementation "com.github.skydoves:balloon:1.1.2"

// Modified libraries
implementation project(':library:MaterialSearchView')
}
Expand Down
Binary file added app/libs/razorpay-android-3.8.8.aar
Binary file not shown.
Binary file added app/libs/razorpay-googlepay-1.3.0.aar
Binary file not shown.
Binary file added app/libs/tez-client-api-0.9.4.aar
Binary file not shown.