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.

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

Jump to bottom

Develop #83

Merged
merged 60 commits into from
Nov 30, 2017
Merged

Develop #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
5c019fb
fix: [ #27 ] Current location will be set when app starts
CloudyPadmal Mar 30, 2017
64286b2
Merge pull request #29 from CloudyPadmal/currentLocation
Dilu9218 Apr 12, 2017
4473920
Added the switch activity switching between private and public reposi…
icancode23 Jun 19, 2017
81f2eed
resolving conflicts
icancode23 Jun 19, 2017
3a78807
Merge branch 'master' into develop
icancode23 Jun 19, 2017
26b85ae
ignore google services
icancode23 Jun 19, 2017
eb9d22b
added the original google services json
icancode23 Jun 19, 2017
f125c79
Minor change Switch activity for public and private vehicles ready
icancode23 Jun 19, 2017
4639492
Added the HomeBaseScreen
icancode23 Jun 19, 2017
5f86b14
Facebook profile extracted person registered as a user in firebase db
icancode23 Jun 23, 2017
ae64dfa
Merge pull request #70 from KuteGSOC/HomeBaseScreen
NickHub4017 Jun 23, 2017
af7dd27
Added Feature for Friend Profile Viewing also improved fragment flow…
icancode23 Jun 25, 2017
db1049a
Replaced google services json and removed my own keys
icancode23 Jun 25, 2017
e3dd479
Code Refactor to remove unnecessary spaces between brackets and unne…
icancode23 Jun 26, 2017
2c30d1d
Replaced google services json and removed my own keys
icancode23 Jun 26, 2017
6d18f95
Merge pull request #71 from KuteGSOC/ConnectViewFriends
NickHub4017 Jun 30, 2017
ab5d123
Some Changes
icancode23 Jul 3, 2017
cc50fe7
Added the feature for custom profile Image
icancode23 Jul 3, 2017
377c596
Changed the layout a bit
icancode23 Jul 3, 2017
b4fa3f9
minor change
icancode23 Jul 5, 2017
44e7266
check
icancode23 Jul 5, 2017
e3df3b7
minor change
icancode23 Jul 5, 2017
a4eb9bd
minor change
icancode23 Jul 5, 2017
d610803
Completed profile edit without integrating edit profile image
icancode23 Jul 6, 2017
14af78b
Merge pull request #72 from KuteGSOC/ProfilePictureEdit
NickHub4017 Jul 7, 2017
35af0b9
midway
icancode23 Jul 7, 2017
f5ed115
Replaced google services and removed self ids from strings
icancode23 Jul 7, 2017
2c303cd
few changes
icancode23 Jul 7, 2017
31bd401
dialog layouts done
icancode23 Jul 7, 2017
fffefde
Deleted some test data sent to git by mistake
icancode23 Jul 7, 2017
4418eac
Complete But not tested
icancode23 Jul 9, 2017
bd86bf1
Dynamic loading of friends using a pull to load recycler view
icancode23 Jul 11, 2017
b4d654e
minor change
icancode23 Jul 12, 2017
11b210e
Merge pull request #73 from KuteGSOC/UserSelfProfileFilling
NickHub4017 Jul 14, 2017
60dff52
small fix
icancode23 Jul 17, 2017
4139a2c
Support for base64 in recycler
icancode23 Jul 21, 2017
9ac333c
replaced google services json
icancode23 Jul 22, 2017
6f7bb5e
fix
icancode23 Jul 22, 2017
7d9e9f8
fix
icancode23 Jul 22, 2017
ef597b2
fix
icancode23 Jul 22, 2017
742ab5c
fix
icancode23 Jul 22, 2017
a73774b
Merge pull request #75 from KuteGSOC/WorkflowFix
NickHub4017 Jul 22, 2017
45a03f5
added routes backend
icancode23 Aug 3, 2017
c75a11d
added routes backend
icancode23 Aug 3, 2017
c65ff11
Merge pull request #76 from KuteGSOC/routesBackend
NickHub4017 Aug 4, 2017
ba5d489
check
icancode23 Aug 13, 2017
f7c04e6
Majorly Complete
icancode23 Aug 21, 2017
64d2e67
Majorly Complete
icancode23 Aug 21, 2017
061a655
Added backend project
icancode23 Aug 21, 2017
b94523a
Added backend project
icancode23 Aug 21, 2017
f0a44f6
Added backend project
icancode23 Aug 21, 2017
e8360b0
Added Send Notification end point on server
icancode23 Aug 22, 2017
7e687e7
Added Send Notification end point on server
icancode23 Aug 22, 2017
67fed75
Merge pull request #77 from KuteGSOC/TripUI
NickHub4017 Aug 23, 2017
dec96c8
Beta Done and completed
icancode23 Aug 26, 2017
b68a026
Beta Done and completed
icancode23 Aug 26, 2017
512d728
Beta Backend
icancode23 Aug 26, 2017
07cd0a8
Beta Backend
icancode23 Aug 26, 2017
ddf5023
Merge pull request #78 from KuteGSOC/BetaComplete
NickHub4017 Aug 26, 2017
b123d3e
Merge branch 'master' into develop
NickHub4017 Nov 30, 2017
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
dialog layouts done
  • Loading branch information
@icancode23
icancode23 committed Jul 7, 2017
commit 31bd401dd7c0dcff49e5a1ff3a2f95bf22d27434
5 changes: 4 additions & 1 deletion ...ute/PrivateVehicles/App/Fragments/InitialDetailDialogFragments/SecondConatctFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import android.view.View;
import android.view.ViewGroup;

import com.scorelab.kute.kute.R;

/**
* Created by nipunarora on 07/07/17.
*/
Expand All @@ -20,6 +22,7 @@ public SecondConatctFragment() {
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return super.onCreateView(inflater, container, savedInstanceState);
v=inflater.inflate(R.layout.contactdetail_detail_dialog_fragment,container,false);
return v;
}
}
6 changes: 5 additions & 1 deletion ...kute/PrivateVehicles/App/Fragments/InitialDetailDialogFragments/ThirdVehicleFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import android.view.View;
import android.view.ViewGroup;

import com.scorelab.kute.kute.R;

/**
* Created by nipunarora on 07/07/17.
*/
Expand All @@ -20,6 +22,8 @@ public ThirdVehicleFragment() {
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
return super.onCreateView(inflater, container, savedInstanceState);
v=inflater.inflate(R.layout.vehicle_name_detail_dialog_fragment,container,false);
return v;
}

}
Binary file added kute-android-app/app/src/main/res/drawable/automobile1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions kute-android-app/app/src/main/res/layout/contactdetail_detail_dialog_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
android:layout_height="match_parent"
/>
<ImageView
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/mobilephone"
/>
<View
Expand Down
113 changes: 57 additions & 56 deletions kute-android-app/app/src/main/res/layout/details_dialog_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView android:layout_height="match_parent"
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:fillViewport="true"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/apptheme">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android">
<ScrollView android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:fillViewport="true"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/apptheme">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<FrameLayout
android:id="@+id/signupfragmentholder"
android:layout_width="match_parent"
android:layout_height="450dp"
android:layout_marginTop="0dp"

android:background="@android:color/black"/>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_top_signup_btn"
android:orientation="horizontal"
android:layout_alignParentBottom="true">

<Button
android:id="@+id/btn_back"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_weight="0.5"
android:background="@null"
android:text="Back"
android:layout_marginRight="3dp"
android:textColor="@android:color/white"
style="@style/Widget.AppCompat.Button.Borderless"/>
<FrameLayout
android:id="@+id/signupfragmentholder"
android:layout_width="match_parent"
android:layout_height="450dp"
android:layout_marginTop="0dp"

<LinearLayout
android:id="@+id/layoutDots"
android:layout_width="0dp"
android:layout_height="@dimen/dots_height"
android:layout_alignParentBottom="true"
android:layout_marginBottom="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"></LinearLayout>
<Button
android:id="@+id/btn_proceed1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_weight="0.5"
android:background="@null"
android:text="Next"
android:layout_marginRight="3dp"
android:textColor="@android:color/white"
style="@style/Widget.AppCompat.Button.Borderless"/>
</LinearLayout>
android:background="@android:color/black"/>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_top_signup_btn"
android:orientation="horizontal"
android:layout_alignParentBottom="true">

<Button
android:id="@+id/btn_back"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_weight="0.5"
android:background="@null"
android:text="Back"
android:layout_marginRight="3dp"
android:textColor="@android:color/white"
style="@style/Widget.AppCompat.Button.Borderless"/>

<LinearLayout
android:id="@+id/layoutDots"
android:layout_width="0dp"
android:layout_height="@dimen/dots_height"
android:layout_alignParentBottom="true"
android:layout_marginBottom="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"></LinearLayout>
<Button
android:id="@+id/btn_proceed1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_weight="0.5"
android:background="@null"
android:text="Next"
android:layout_marginRight="3dp"
android:textColor="@android:color/white"
style="@style/Widget.AppCompat.Button.Borderless"/>
</LinearLayout>

</RelativeLayout>
</ScrollView>
</RelativeLayout>
</ScrollView>
</android.support.design.widget.CoordinatorLayout>
10 changes: 4 additions & 6 deletions kute-android-app/app/src/main/res/layout/starting_detail_dialog_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
android:layout_height="match_parent"
/>
<ImageView
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/collaboration"
/>
<View
Expand All @@ -28,9 +27,8 @@
android:layout_height="match_parent"
/>
<ImageView
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/automobile"
/>

Expand Down
144 changes: 144 additions & 0 deletions kute-android-app/app/src/main/res/layout/vehicle_name_detail_dialog_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/splashBackground">
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp">
<View
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
<ImageView
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/automobile1"
/>
<View
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="40dp">
<View
android:layout_weight="0.3"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
<TextView
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@android:color/white"
android:textSize="25sp"
android:textStyle="bold"
android:text="@string/slide_3_title"
android:textAlignment="center"
android:layout_marginLeft="5dp"/>
<View
android:layout_weight="0.3"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="10dp">
<View
android:layout_weight="0.1"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
<TextView
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@android:color/white"
android:textSize="20sp"
android:text="@string/slide_3_desc"
android:textAlignment="center"
android:layout_marginLeft="5dp"/>
<View
android:layout_weight="0.1"
android:layout_width="0dp"
android:layout_height="match_parent"
/>

</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="10dp">
<View
android:layout_weight="0.1"
android:layout_width="0dp"
android:layout_height="match_parent"
/>
<TextView
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@android:color/white"
android:textSize="20sp"
android:text="@string/slide_3_desc_2"
android:textAlignment="center"
android:layout_marginLeft="5dp"
android:fontFamily="sans-serif-condensed"
android:textStyle="italic"
/>
<View
android:layout_weight="0.1"
android:layout_width="0dp"
android:layout_height="match_parent"
/>


</TableRow>
<TableRow
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="20dp">

<ImageView
android:id="@+id/contactIcon"
android:layout_width="0dp"
android:layout_weight="0.5"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_call_black_24dp"
android:layout_marginLeft="8dp"/>
<android.support.design.widget.TextInputLayout
android:layout_width="0dp"
android:layout_weight="4"
android:layout_height="wrap_content"
android:textColorHint="#ffffff"
android:layout_marginLeft="8dp"
android:layout_toRightOf="@+id/contactIcon">
<EditText android:id="@+id/input_pswd"
android:layout_width="283dp"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:hint="Your Vehicle Name" />
</android.support.design.widget.TextInputLayout>
<View
android:layout_weight="0.25"
android:layout_width="0dp"
android:layout_height="match_parent"
/>

</TableRow>

</TableLayout>

</LinearLayout>
3 changes: 3 additions & 0 deletions kute-android-app/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@
<string name="slide_1_desc_2">We need your Contact and Vehicle Name(If Applicable) to setup your profile</string>
<string name="slide_2_title">Your Contact</string>
<string name="slide_2_desc">This will be the point of contact for the fellow app users!</string>
<string name="slide_3_title">Your Vehicle Name</string>
<string name="slide_3_desc">This will be displayed to fellow app users who wish to pool with you!"</string>
<string name="slide_3_desc_2">Leave Empty if not applicable</string>

</resources>