Skip to content

Commit f9760a8

Browse files
sytolksytolk
committed
API 14
1 parent 18ffc05 commit f9760a8

33 files changed

Lines changed: 444 additions & 204 deletions

‎AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
android:excludeFromRecents="true">
121121
</activity>
122122
<activity
123-
android:name=".LostPasswordActivity_"
123+
android:name=".LostPasswordFragment_"
124124
android:allowTaskReparenting="false"
125125
android:taskAffinity=""
126126
android:excludeFromRecents="true">

‎TaxiAndroidOpen.apk‎

-37.3 KB
Binary file not shown.

‎TaxiAndroidOpen.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
3838
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" generated="true" />
3940
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
4041
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" />
4142
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
@@ -70,7 +71,6 @@
7071
<orderEntry type="library" name="Maven: com.google.android.gms:play-services-basement:aar:8.4.0" level="project" />
7172
<orderEntry type="library" name="Maven: com.google.android.gms:play-services-gcm:aar:8.4.0" level="project" />
7273
<orderEntry type="library" name="Maven: com.google.android.gms:play-services-measurement:aar:8.4.0" level="project" />
73-
<orderEntry type="library" name="Maven: com.google.android.gms:play-services-plus:aar:8.4.0" level="project" />
7474
<orderEntry type="library" name="Maven: com.android.support:appcompat-v7:aar:23.1.1" level="project" />
7575
<orderEntry type="library" name="Maven: com.android.support:support-v4:aar:23.1.1" level="project" />
7676
<orderEntry type="library" name="Maven: com.android.support:design:aar:23.1.1" level="project" />

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,12 @@
155155
<type>aar</type>
156156
</dependency>
157157

158-
<dependency>
158+
<!--<dependency>
159159
<groupId>com.google.android.gms</groupId>
160160
<artifactId>play-services-plus</artifactId>
161161
<version>${play-service-version}</version>
162162
<type>aar</type>
163-
</dependency>
163+
</dependency>-->
164164

165165
<!--<dependency>
166166
<groupId>com.android.support</groupId>

‎res/layout-large/request_details.xml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,15 @@
104104
android:layout_width="0dp"
105105
android:layout_height="wrap_content"
106106
android:layout_weight=".5"
107-
android:text="@string/car_price"
107+
android:text="@string/status"
108108
android:textSize="20sp"/>
109109
<TextView
110-
android:id="@+id/price_group"
110+
android:id="@+id/state"
111111
android:layout_width="0dp"
112112
android:layout_height="wrap_content"
113113
android:layout_weight=".5"
114-
android:textSize="20sp"/>
114+
android:textSize="20sp"
115+
android:textColor="@color/red_color"/>
115116
</LinearLayout>
116117
<LinearLayout
117118
android:layout_width="fill_parent"
@@ -123,10 +124,10 @@
123124
android:layout_width="0dp"
124125
android:layout_height="wrap_content"
125126
android:layout_weight=".5"
126-
android:text="@string/needs_from"
127+
android:text="@string/car_price"
127128
android:textSize="20sp"/>
128129
<TextView
129-
android:id="@+id/chosen_group"
130+
android:id="@+id/price_group"
130131
android:layout_width="0dp"
131132
android:layout_height="wrap_content"
132133
android:layout_weight=".5"
@@ -142,10 +143,10 @@
142143
android:layout_width="0dp"
143144
android:layout_height="wrap_content"
144145
android:layout_weight=".5"
145-
android:text="@string/car_arrive_time"
146+
android:text="@string/needs_from"
146147
android:textSize="20sp"/>
147148
<TextView
148-
android:id="@+id/arrive_time"
149+
android:id="@+id/chosen_group"
149150
android:layout_width="0dp"
150151
android:layout_height="wrap_content"
151152
android:layout_weight=".5"
@@ -161,10 +162,10 @@
161162
android:layout_width="0dp"
162163
android:layout_height="wrap_content"
163164
android:layout_weight=".5"
164-
android:text="@string/time_remaining"
165+
android:text="@string/car_arrive_time"
165166
android:textSize="20sp"/>
166167
<TextView
167-
android:id="@+id/remaining_time"
168+
android:id="@+id/arrive_time"
168169
android:layout_width="0dp"
169170
android:layout_height="wrap_content"
170171
android:layout_weight=".5"
@@ -180,10 +181,10 @@
180181
android:layout_width="0dp"
181182
android:layout_height="wrap_content"
182183
android:layout_weight=".5"
183-
android:text="@string/status"
184+
android:text="@string/time_remaining"
184185
android:textSize="20sp"/>
185186
<TextView
186-
android:id="@+id/state"
187+
android:id="@+id/remaining_time"
187188
android:layout_width="0dp"
188189
android:layout_height="wrap_content"
189190
android:layout_weight=".5"

‎res/layout/app_bar_main.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:layout_width="match_parent"
1414
android:theme="@style/AppTheme.AppBarOverlay">
1515

16-
<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
16+
<android.support.v7.widget.Toolbar android:id="@+id/action_bar"
1717
android:layout_width="match_parent" android:layout_height="wrap_content"
1818
android:minHeight="?attr/actionBarSize"
1919
android:background="?attr/colorPrimary"
@@ -52,16 +52,22 @@
5252
app:ico_size="48dp"
5353
android:layout_gravity="center|end"/>-->
5454

55-
<com.getbase.floatingactionbutton.FloatingActionButton
56-
android:id="@+id/fab"
57-
android:layout_width="wrap_content"
58-
android:layout_height="wrap_content"
59-
fab:fab_colorNormal="@color/yellow_color"
60-
fab:fab_colorPressed="@color/white_color"
61-
fab:fab_size="normal"
62-
android:layout_gravity="bottom|end"
63-
android:layout_margin="@dimen/fab_margin"
64-
android:scaleType="centerCrop"
65-
android:visibility="invisible"/> <!--fab:fab_icon="@drawable/travel59"-->
55+
<FrameLayout
56+
android:id="@+id/status_drop"
57+
android:layout_width="match_parent"
58+
android:layout_height="match_parent">
59+
60+
<com.getbase.floatingactionbutton.FloatingActionButton
61+
android:id="@+id/fab"
62+
android:layout_width="wrap_content"
63+
android:layout_height="wrap_content"
64+
fab:fab_colorNormal="@color/yellow_color"
65+
fab:fab_colorPressed="@color/white_color"
66+
fab:fab_size="normal"
67+
android:layout_gravity="bottom|end"
68+
android:layout_margin="@dimen/fab_margin"
69+
android:scaleType="centerCrop"
70+
android:visibility="invisible"/> <!--fab:fab_icon="@drawable/travel59"-->
71+
</FrameLayout>
6672

6773
</android.support.design.widget.CoordinatorLayout>

‎res/layout/login.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@
130130
android:textColor="@color/black_color"
131131
android:textAppearance="?android:attr/textAppearanceMedium"/>
132132

133-
<com.google.android.gms.common.SignInButton
133+
<!--<com.google.android.gms.common.SignInButton
134134
android:id="@+id/g_sign_in_button"
135135
android:layout_width="match_parent"
136136
android:layout_height="wrap_content"
137-
android:padding="5dp"/>
137+
android:padding="5dp"/>-->
138138

139139
<com.facebook.login.widget.LoginButton
140140
xmlns:fb="http://schemas.android.com/apk/res-auto"

‎res/layout/lostpassword.xml‎

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,65 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="vertical"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:divider="?android:dividerHorizontal"
8+
android:showDividers="middle">
29

3-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:layout_width="fill_parent"
5-
android:layout_height="match_parent"
6-
android:orientation="vertical">
10+
<ProgressBar android:id="@+id/lost_progress" style="?android:attr/progressBarStyleLarge"
11+
android:layout_width="wrap_content" android:layout_height="wrap_content"
12+
android:layout_marginBottom="8dp" android:visibility="gone"/>
713

814
<TextView
9-
android:textSize="30dp"
15+
android:textSize="30sp"
1016
android:layout_width="wrap_content"
1117
android:layout_height="wrap_content"
1218
android:text="@string/lost_pass_email"
1319
android:layout_marginTop="30dp"
14-
android:layout_alignParentRight="false"
1520
android:layout_gravity="center"
1621
android:layout_marginBottom="30dp"/>
1722

18-
<LinearLayout
23+
<ScrollView
1924
android:layout_width="fill_parent"
25+
android:layout_height="0px"
26+
android:layout_weight="1">
27+
28+
29+
<android.support.design.widget.TextInputLayout android:layout_width="match_parent"
30+
android:layout_height="wrap_content">
31+
<EditText
32+
android:id="@+id/userEmailField"
33+
android:layout_width="match_parent"
34+
android:layout_height="wrap_content"
35+
android:layout_marginTop="15dp"
36+
android:hint="@string/email"
37+
android:imeActionId="@+id/login"
38+
android:imeOptions="actionUnspecified"
39+
android:inputType="textEmailAddress"
40+
android:maxLines="1"
41+
android:padding="8dp"
42+
android:singleLine="true"
43+
android:textColorHint="@color/white_color">
44+
<requestFocus/>
45+
</EditText>
46+
</android.support.design.widget.TextInputLayout>
47+
</ScrollView>
48+
49+
<LinearLayout
50+
android:layout_width="match_parent"
2051
android:layout_height="wrap_content"
2152
android:orientation="horizontal"
22-
android:layout_margin="10dp">
53+
android:gravity="center_vertical"
54+
style="?android:buttonBarStyle">
2355

24-
<TextView
25-
android:clickable="false"
26-
android:layout_width="0dip"
27-
android:layout_height="wrap_content"
28-
android:layout_weight=".4"
29-
android:text="@string/email"
30-
android:textStyle="bold"
31-
android:textSize="20dp"
32-
android:gravity="right"
33-
android:layout_marginRight="10dp"/>
34-
35-
<EditText
36-
android:id="@+id/userEmailField"
37-
android:layout_width="0dip"
56+
<Button
57+
android:id="@+id/sendButton"
58+
android:layout_width="match_parent"
3859
android:layout_height="wrap_content"
39-
android:drawSelectorOnTop="true"
40-
android:layout_weight=".6"
41-
android:layout_marginRight="40dp"
42-
android:inputType="textEmailAddress"
43-
android:imeOptions="actionSend">
44-
45-
<requestFocus/>
46-
</EditText>
60+
android:text="@string/send"
61+
android:textSize="@dimen/main_button"
62+
style="?android:attr/buttonBarButtonStyle"/>
63+
4764
</LinearLayout>
4865
</LinearLayout>

‎res/layout/main.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
android:layout_height="match_parent" />
1010

1111
<android.support.design.widget.NavigationView android:id="@+id/nav_view"
12-
android:layout_width="wrap_content" android:layout_height="match_parent"
13-
android:layout_gravity="start" android:fitsSystemWindows="true"
14-
app:headerLayout="@layout/nav_header_main" app:menu="@menu/activity_main_drawer" />
12+
android:layout_width="wrap_content"
13+
android:layout_height="match_parent"
14+
android:layout_gravity="start"
15+
android:fitsSystemWindows="true"
16+
app:headerLayout="@layout/nav_header_main"
17+
app:menu="@menu/activity_main_drawer"
18+
app:theme="@style/NavigationDrawerStyle" />
1519

1620
</android.support.v4.widget.DrawerLayout>

‎res/layout/msg_layout.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
android:layout_height="match_parent"
77
android:orientation="vertical"
88
android:divider="?android:dividerHorizontal"
9-
android:showDividers="middle"
10-
android:clickable="true"
9+
android:showDividers="middle" >
10+
<!--android:clickable="true"
1111
android:focusable="true"
12-
android:focusableInTouchMode="true">
12+
android:focusableInTouchMode="true"-->
1313

1414
<ScrollView
1515
android:layout_width="fill_parent"

0 commit comments

Comments
 (0)