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

Release v1.0.0 #8

Merged
merged 31 commits into from
Mar 11, 2020
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
89d38c8
Initial project setup
aditmodhvadia Nov 15, 2019
9a7f01d
- project structure set up
aditmodhvadia Nov 15, 2019
6ad89bb
- add BaseActivity and BaseFragment
aditmodhvadia Nov 15, 2019
fde1134
- set up FireBase library module
aditmodhvadia Nov 15, 2019
afdcea3
- add apiManager instance to BaseActivity and BaseFragment
aditmodhvadia Nov 15, 2019
42e4792
Merge pull request #1 from aditmodhvadia/project-setup
aditmodhvadia Nov 15, 2019
d7035b0
- add Timber for logging
aditmodhvadia Nov 15, 2019
116a05e
- add test case for SplashActivity
aditmodhvadia Nov 15, 2019
813b43f
- registered and create user with email and password on successfully …
aditmodhvadia Nov 15, 2019
ba30493
- add LandingActivity
aditmodhvadia Nov 16, 2019
b6079c7
- add LoginActivity and complete it's flow
aditmodhvadia Nov 17, 2019
f1ae813
Merge pull request #2 from aditmodhvadia/feature/splash_login_flow
aditmodhvadia Nov 17, 2019
46c41e4
- add Chat room display to LandingActivity
aditmodhvadia Nov 18, 2019
7049564
- add ChatActivity with different views for sent and received messages
aditmodhvadia Nov 18, 2019
b4d7536
- setup dummy data for messages
aditmodhvadia Nov 18, 2019
6d955a6
Merge pull request #3 from aditmodhvadia/feature/chat_setup
aditmodhvadia Nov 18, 2019
105ac24
- add room dependencies
aditmodhvadia Nov 18, 2019
cee36c8
Merge pull request #4 from aditmodhvadia/feature/room_setup_for_messages
aditmodhvadia Nov 18, 2019
a5e7eca
- add NetworkManager to application
aditmodhvadia Nov 23, 2019
6447214
- fix LoginActivity and RegistrationActivity flow
aditmodhvadia Nov 23, 2019
e74a5b5
- add API call for querying backend
aditmodhvadia Nov 23, 2019
a2a1c11
Merge pull request #5 from aditmodhvadia/feature/network_manager
aditmodhvadia Nov 23, 2019
04b8113
- change GET request to POST and send message query with it
aditmodhvadia Nov 24, 2019
f73bce5
- add method to store new sent messages and query response messages t…
aditmodhvadia Nov 29, 2019
bfb80c7
- add IntentService to store messages in FireBase and sync messages f…
aditmodhvadia Nov 30, 2019
1063031
- add static method to Message.java to convert given message into a H…
aditmodhvadia Nov 30, 2019
19fdf86
Merge pull request #6 from aditmodhvadia/feature/firebase_sync_service
aditmodhvadia Nov 30, 2019
8da01c8
Ui/ui updates refinement (#7)
aditmodhvadia Dec 12, 2019
9093643
- update develop branch
aditmodhvadia Mar 10, 2020
9b14d42
- update documentation
aditmodhvadia Mar 10, 2020
525ed62
Update README.md
aditmodhvadia Mar 11, 2020
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
Prev Previous commit
Next Next commit
- update develop branch
aditmodhvadia committed Mar 10, 2020
commit 9093643aeeee0211cbb8c06dcfec6fda025efc22
6 changes: 3 additions & 3 deletions .idea/modules.xml

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

Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import com.fazemeright.chatbotmetcs622.network.ApiManager;
import com.fazemeright.chatbotmetcs622.network.NetworkManager;
import com.fazemeright.chatbotmetcs622.repositories.MessageRepository;
import com.fazemeright.firebase_api_library.api.FireBaseApiManager;

@@ -22,13 +24,16 @@ public abstract class BaseActivity extends AppCompatActivity {
public Context mContext;
protected FireBaseApiManager fireBaseApiManager;
protected MessageRepository messageRepository;
protected ApiManager apiManager;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mContext = this;
fireBaseApiManager = FireBaseApiManager.getInstance();
messageRepository = MessageRepository.getInstance(mContext);
apiManager = ApiManager.getInstance();
apiManager.init(NetworkManager.getInstance());
setContentView(getLayoutResId());
}

Original file line number Diff line number Diff line change
@@ -13,21 +13,26 @@
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.fazemeright.chatbotmetcs622.network.ApiManager;
import com.fazemeright.chatbotmetcs622.network.NetworkManager;
import com.fazemeright.chatbotmetcs622.repositories.MessageRepository;
import com.fazemeright.firebase_api_library.api.FireBaseApiManager;

public abstract class BaseFragment extends Fragment {

public Context mContext;
public FireBaseApiManager apiManager;
public FireBaseApiManager fireBaseApiManager;
protected MessageRepository messageRepository;
protected ApiManager apiManager;

@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mContext = getActivity();
apiManager = FireBaseApiManager.getInstance();
fireBaseApiManager = FireBaseApiManager.getInstance();
messageRepository = MessageRepository.getInstance(mContext);
apiManager = ApiManager.getInstance();
apiManager.init(NetworkManager.getInstance());
}

@Nullable
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Nov 14 23:44:31 EST 2019
#Tue Mar 10 17:34:51 EDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip