Skip to content

Commit

Permalink
Fourth Release (beta-2-0-1) (#13)
Browse files Browse the repository at this point in the history
* - intermediate commit for tracking progress
- converting to Mvp

* - changee edittext to material textinput layouts

* - fix progress dialog time issue

* - replace alert dialogs with alertutils dialog

* - migrate hardcoded string to strings.xml

* - add default material toolbar

* - add toolbar to cart activity

* - add toolbar to order list activity

* - add swipe left to remove item from cart
- add model class for cart item

* - change snackbar texts
- add apputils for common methods

* - update dependencies in graddle

* - change package name to be small case

* - major file structure changes

* - resolve conflicts with merge

* - add base package for Activity and Mvp

* - convert splash to follow Mvp(Partial)

* - convert orderList to Mvp

* - add loading dialog to base and orderlist activity

* - add Mvp for OrderDetail

* - change OrderDetailActivity to Mvp

* - add version name to SplashActivity

* - add down arrow to CartActivity back button

* - change package names

* - add common loading dialog

* - add display of date in time selection dialog

* - add category to FoodItem model
- move rating color matcher to AppUtils
- hide rating section if no rating data available

* - shorten CartItem class and refine it's usage

* - upgrade version code and version name to beta-2-0-0
- use model classes for managing orders
- better concurrency management for database
- use cloud functions for server side code
- getting ready to better manage security rules for database with cloud functions

* - add rollNo to BaseActivity

* - extend FoodItem to CartItem and corresponding changes
- extend BaseActivity to CartActivity and corresponding changes
- add new AlertUtils class

* - move Add to Cart dialog to AlertUtils

* - remove unversioned files

* - add encodings.xml

* - change ListView to RecyclerView for FoodCategoryFragment
- change shimmer delay to 500ms

* - change ListView to RecyclerView for OrderDetailActivity
- add toString() override for FullOrder

* - change ListView to RecyclerView for OrderListActivity
- add back button to toolbar of OrderDetailActivity

* - refactoring and renaming

* - remove old model for order

* - add classes for reading FireBase Realtime Database
- add access to FireBaseApiManager to BasePresenter

* - add common orderDetailListener to FireBaseApiManager
- change path from String to DatabaseReference

* - add common orderListListener to FireBaseApiManager

* - add BaseFragment
- extend BaseFragment for FoodCategoryFragment
- add foodMenuListener to FireBaseApiManager

* - code optimization and refactoring

* - add method for signOut
- add method for determining isUserEmailVerified

* - change RegisterFragment to extend BaseFragment
- add corresponding methods to ApiWrapper and ApiManager for RegistrationFragment

* - disable ActionCodeSettings for now
- change to mvp for LoginFragment with Sign-In flow

* - change to mvp for Forgot Password in LoginFragment

* - add FireBaseDynamicLink to redirect back to app from verification email
- change in registration and login flow
- change LoginActivity to Mvp
- file restructuring

* - add check for terms and conditions accept

* - update toString() for models
- add auth reload to splash to reload state of user every time the app opens

* - add password toggle to RegisterFragment

* - Mvp for Splash with shift to ApiManager

* - Mvp for CartActivity
- DataManager to store In-Memory data such as Cart Items
- listeners for CartActivityDisplayAdapter and FoodMenuDisplayAdapter using new DataManager

* - completely removed FireBase dependencies from Activities or Fragments

* - separate out FireBase APIs and Data Models into libraries
- change interfaces to eliminate the need for Fire Api listeners, database listeners pending
- change FoodMenuDisplayActivity to Mvp

* - move openCart() to presenter
- add bottom padding to menu display with clip to padding false

* - optimize ApiWrapper
- can add listener again when required in future

* - remove rollNo from function parameters in ApiManager

* - completely eliminate dependency o FireBase from app module and move to FireBaseApiLibrary
- use DBValueEventListener to listen to Database events with generic type parameter for methods

* - add javadoc to FullOrder

* - Fourth Release (beta-2-0-0)
  • Loading branch information
aditmodhvadia authored Jun 17, 2019
1 parent e7edeaa commit d4e318b
Show file tree
Hide file tree
Showing 153 changed files with 5,684 additions and 2,881 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
29 changes: 0 additions & 29 deletions .idea/codeStyles/Project.xml

This file was deleted.

4 changes: 4 additions & 0 deletions .idea/encodings.xml

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

35 changes: 18 additions & 17 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "com.example.getfood"
minSdkVersion 23
targetSdkVersion 27
versionCode 2
versionName "beta-1-1-2"
targetSdkVersion 28
versionCode 4
versionName "beta-2-0-1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -22,27 +22,28 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-compat:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.google.firebase:firebase-database:16.0.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.google.firebase:firebase-inappmessaging-display:17.0.0'
implementation 'com.google.firebase:firebase-core:16.0.1'
implementation 'com.google.firebase:firebase-auth:16.0.3'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-compat:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
implementation 'com.android.volley:volley:1.1.0'
implementation 'com.google.android.gms:play-services-maps:15.0.1'
implementation 'com.google.android.gms:play-services-maps:16.1.0'
implementation 'com.paytm:pgplussdk:1.1.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.facebook.shimmer:shimmer:0.4.0'
implementation 'com.wang.avi:library:2.1.3'

implementation project(':firebase_api__library')
}

apply plugin: 'com.google.gms.google-services'
41 changes: 24 additions & 17 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,8 @@
android:roundIcon="@mipmap/ic_launcher_icon_k"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".Activity.LoginActivity"
android:name=".ui.loginregister.LoginActivity"
android:label="Get Food"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -37,9 +30,18 @@

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data
android:host="getfood.page.link"
android:scheme="https"/>
</intent-filter>
</activity>
<activity
android:name=".Activity.FoodMenuDisplayActivity"
android:name=".ui.foodmenu.FoodMenuDisplayActivity"
android:label="@string/title_activity_food_menu_display"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -50,25 +52,29 @@
</intent-filter>
</activity>
<activity
android:name=".Activity.CartActivity"
android:screenOrientation="portrait" />
android:name=".ui.cart.CartActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".Activity.OrderActivity"
android:name=".ui.orderdetail.OrderDetailActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.paytm.pgsdk.PaytmPGActivity"
android:configChanges="keyboardHidden|orientation|keyboard"
android:screenOrientation="portrait" />

<service
android:name=".Service.OrderNotificationService"
android:name=".service.OrderNotificationService"
android:enabled="true"
android:exported="true" />

<activity
android:name=".Activity.TermsActivity"
android:name=".ui.terms.TermsActivity"
android:screenOrientation="portrait" />
<activity android:name=".Activity.OrderListActivity" android:screenOrientation="portrait">
<activity
android:name=".ui.orderlist.OrderListActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">

</activity>
<!--
Expand All @@ -84,9 +90,10 @@
android:value="@string/google_maps_key" />

<activity
android:name=".Activity.MapsActivity"
android:name=".ui.map.MapsActivity"
android:label="@string/title_activity_maps" />
<activity android:name=".Activity.SplashActivity"
<activity
android:name=".ui.splash.SplashActivity"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<intent-filter>
Expand Down
Loading

0 comments on commit d4e318b

Please sign in to comment.