Skip to content

Release/1.1.0 #48

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.

Sign up for GitHub

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
ThiemJson wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Release/1.1.0 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2656c2b
update android studio
Jun 10, 2021
3ecf1a4
Merge branch 'master' of github.com:ThiemJson/Android-TLUConnect
Jun 10, 2021
1df88e8
Merge branch 'master' of github.com:ThiemJson/Android-TLUConnect
Jun 22, 2021
e0d9f65
User email displayed incorrect
Jun 22, 2021
32bcba9
Handler when user register with Facebook but cannot retrive user email
Jun 22, 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
2 changes: 1 addition & 1 deletion .idea/compiler.xml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

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

10 changes: 10 additions & 0 deletions .idea/runConfigurations.xml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions app/src/main/java/teneocto/thiemjason/tlu_connect/ui/home/HomeFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public void onCreate(Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
container.getContext();
View view = inflater.inflate(R.layout.fragment_home, container, false);
progressDialog = new CustomProgressDialog(getContext(), "");
Log.i(TAG, "On View Create");
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/teneocto/thiemjason/tlu_connect/ui/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten

/**
* Handle Facebook Access Token
*
* @param token Facebook Token
*/
private void handleFacebookAccessToken(AccessToken token) {
Expand Down Expand Up @@ -235,11 +236,18 @@ private void handleFacebookAccessToken(AccessToken token) {

/**
* Register Facebook
*
* @param token Access Token
*/
private void registerWithFacebook(AccessToken token) {
UserDTO userDTO = new UserDTO();
userDTO.setEmail(mAuth.getCurrentUser().getEmail());

String userEmail = mAuth.getCurrentUser().getEmail();
if (userEmail == null || userEmail.equals("")) {
userEmail = "Your email";
}

userDTO.setEmail(userEmail);
userDTO.setLastName("");
userDTO.setFirstName(mAuth.getCurrentUser().getDisplayName());
userDTO.setFirebaseId(mAuth.getCurrentUser().getUid());
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/layout/fragment_profile_infomation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="0.65"
android:width="0dp"
android:fontFamily="@font/lincol"
android:gravity="center_vertical"
Expand All @@ -184,20 +184,19 @@
android:textSize="13sp" />

<EditText
android:focusable="false"
android:id="@+id/profile_email"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginEnd="6dp"
android:layout_weight="2"
android:layout_weight="2.35"
android:width="0dp"
android:background="@drawable/table_edittext"
android:hint="Enter your email address"
android:maxLength="30"
android:maxLength="40"
android:singleLine="true"
android:textAlignment="textEnd"
android:textColor="@color/gray_light"
android:textColor="@color/gray_dark"
android:textColorHint="@drawable/table_edittext_hint"
android:textSize="13sp" />
</LinearLayout>
Expand Down