Skip to content

Commit 0ffa9b5

Browse files
sytolksytolk
committed
API 14
1 parent 91c7750 commit 0ffa9b5

32 files changed

Lines changed: 273 additions & 186 deletions

‎.idea/libraries/Maven__com_taxi_bulgaria_common_common_1_0_1_SNAPSHOT.xml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@
171171
android:taskAffinity=""
172172
android:excludeFromRecents="true">
173173
</activity>-->
174-
<activity
174+
<!--<activity
175175
android:name=".HelpActivity_"
176176
android:allowTaskReparenting="false"
177177
android:taskAffinity=""
178178
android:excludeFromRecents="true">
179-
</activity>
179+
</activity>-->
180180

181181
<!--osmap-->
182182
<!--<activity
@@ -275,6 +275,7 @@
275275
</intent-filter>
276276
</service>
277277
<service android:name=".service.CoordinatesService"/>
278+
<service android:name=".gcm.GCMRegisterService"/>
278279

279280
<!--<service android:name="com.littlefluffytoys.littlefluffylocationlibrary.LocationBroadcastService"/>
280281

‎TaxiAndroidOpen.apk‎

-47.8 KB
Binary file not shown.

‎TaxiAndroidOpen.iml‎

Lines changed: 3 additions & 2 deletions
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" />
@@ -97,8 +98,8 @@
9798
<orderEntry type="library" name="Maven: com.parse.bolts:bolts-android:1.2.0" level="project" />
9899
<orderEntry type="library" name="Maven: com.github.nicolasjafelle:paginglistview:aar:1.3" level="project" />
99100
<orderEntry type="library" name="Maven: it.sephiroth.android.library.targettooltip:target-tooltip-library:aar:1.3.11" level="project" />
100-
<orderEntry type="library" name="Maven: com.mikepenz:iconics-core:aar:2.5.5" level="project" />
101-
<orderEntry type="library" name="Maven: com.mikepenz:google-material-typeface:aar:2.1.0.1.original" level="project" />
101+
<orderEntry type="library" name="Maven: com.joanzapata.iconify:android-iconify:aar:2.1.1" level="project" />
102+
<orderEntry type="library" name="Maven: com.joanzapata.iconify:android-iconify-material:aar:2.1.1" level="project" />
102103
</component>
103104
<component name="org.twodividedbyzero.idea.findbugs">
104105
<option name="_basePreferences">

‎assets/fonts/google-material-font-v2.1.0.1.ttf‎

-130 KB
Binary file not shown.

‎assets/iconify/android-iconify-material.ttf‎

105 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,32 @@
292292
</dependency>
293293

294294
<dependency>
295+
<groupId>com.joanzapata.iconify</groupId>
296+
<artifactId>android-iconify</artifactId>
297+
<type>aar</type>
298+
<version>2.1.1</version>
299+
<exclusions>
300+
<exclusion>
301+
<groupId>com.android.support</groupId>
302+
<artifactId>support-v4</artifactId>
303+
</exclusion>
304+
</exclusions>
305+
</dependency>
306+
307+
<dependency>
308+
<groupId>com.joanzapata.iconify</groupId>
309+
<artifactId>android-iconify-material</artifactId>
310+
<type>aar</type>
311+
<version>2.1.1</version>
312+
<exclusions>
313+
<exclusion>
314+
<groupId>com.joanzapata.iconify</groupId>
315+
<artifactId>android-iconify</artifactId>
316+
</exclusion>
317+
</exclusions>
318+
</dependency>
319+
320+
<!--<dependency>
295321
<groupId>com.mikepenz</groupId>
296322
<artifactId>iconics-core</artifactId>
297323
<version>2.5.5</version>
@@ -302,13 +328,11 @@
302328
<artifactId>appcompat-v7</artifactId>
303329
</exclusion>
304330
</exclusions>
305-
</dependency>
331+
</dependency>-->
306332

307-
<dependency>
333+
<!--<dependency>
308334
<groupId>com.mikepenz</groupId>
309335
<artifactId>google-material-typeface</artifactId>
310-
<!--<artifactId>material-design-iconic-typeface</artifactId>-->
311-
<!--<version>2.2.0.1</version>-->
312336
<version>2.1.0.1.original</version>
313337
<type>aar</type>
314338
<exclusions>
@@ -317,7 +341,7 @@
317341
<artifactId>library-core</artifactId>
318342
</exclusion>
319343
</exclusions>
320-
</dependency>
344+
</dependency>-->
321345

322346
<!--<dependency>
323347
<groupId>com.android.support</groupId>

‎res/layout/contacts.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:divider="?android:dividerHorizontal"
7+
android:showDividers="middle"
8+
android:theme="@style/BlackTextViewStyle">
9+
10+
<TextView
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:layout_gravity="center"
14+
android:text="@string/contactText"/>
15+
16+
<EditText
17+
android:id="@+id/contactForm"
18+
android:layout_width="fill_parent"
19+
android:layout_height="0px"
20+
android:layout_weight="1"
21+
android:inputType="textMultiLine"
22+
android:lines="5">
23+
<requestFocus/>
24+
</EditText>
25+
26+
<LinearLayout android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:orientation="horizontal"
29+
android:gravity="center_vertical"
30+
style="?android:buttonBarStyle">
31+
32+
<Button android:id="@+id/sendButton"
33+
android:layout_width="fill_parent"
34+
android:layout_height="wrap_content"
35+
android:text="@string/send"
36+
android:textSize="@dimen/main_button"
37+
style="?android:attr/buttonBarButtonStyle"
38+
android:textStyle="bold"/>
39+
</LinearLayout>
40+
</LinearLayout>

‎res/layout/links_layout.xml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="vertical"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent"
6-
android:orientation="vertical">
7+
android:divider="?android:dividerHorizontal"
8+
android:showDividers="middle">
79

810
<ScrollView
911
android:layout_width="fill_parent"
@@ -16,13 +18,20 @@
1618
/>
1719
</ScrollView>
1820

19-
<Button
20-
android:gravity="center"
21-
android:id="@+id/backButton"
22-
android:layout_width="250dp"
23-
android:layout_height="65dp"
24-
android:layout_marginLeft="10dp"
25-
android:text="@string/back"
26-
android:layout_gravity="center_horizontal"/>
21+
<LinearLayout
22+
android:layout_width="match_parent"
23+
android:layout_height="wrap_content"
24+
android:orientation="horizontal"
25+
android:gravity="center_vertical"
26+
style="?android:buttonBarStyle">
2727

28+
<Button
29+
android:id="@+id/okButton"
30+
android:layout_width="match_parent"
31+
android:layout_height="wrap_content"
32+
android:text="@string/okbutton"
33+
android:textSize="@dimen/main_button"
34+
style="?android:attr/buttonBarButtonStyle"/>
35+
36+
</LinearLayout>
2837
</LinearLayout>

‎res/layout/new_request.xml‎

Lines changed: 18 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,7 @@
8888
android:paddingBottom="5dp"
8989
android:src="@android:drawable/ic_menu_mylocation"
9090
android:layout_width="wrap_content"
91-
android:layout_height="wrap_content" />
92-
93-
<!--<Button
94-
android:id="@+id/addressChange"
95-
android:layout_width="0dp"
96-
android:layout_height="wrap_content"
97-
android:visibility="gone"
98-
android:text="@string/change"
99-
android:layout_weight=".2"/>-->
91+
android:layout_height="wrap_content"/>
10092
</LinearLayout>
10193

10294
<android.support.design.widget.TextInputLayout android:layout_width="match_parent"
@@ -204,47 +196,33 @@
204196
</LinearLayout>
205197
</ScrollView>
206198

207-
<!--<LinearLayout
208-
android:id="@+id/reqInfoButtonContainer"
209-
android:layout_width="fill_parent"
210-
android:layout_height="wrap_content"
211-
android:minHeight="90dp"
212-
android:orientation="horizontal"
213-
android:layout_margin="10dp"
214-
android:gravity="center_vertical">
215-
216-
<TextView
217-
android:layout_width="0dp"
218-
android:layout_height="wrap_content"
219-
android:layout_weight=".3"/>
199+
<LinearLayout android:layout_width="match_parent"
200+
android:layout_height="wrap_content"
201+
android:orientation="horizontal"
202+
android:gravity="center_vertical"
203+
style="?android:buttonBarStyle"
204+
android:divider="?android:dividerVertical"
205+
android:showDividers="middle">
220206

221207
<Button
222-
android:id="@+id/requestSend"
208+
android:id="@+id/history"
223209
android:layout_width="0dp"
210+
android:layout_weight=".5"
224211
android:layout_height="wrap_content"
225-
android:text="@string/request_taxi"
226-
android:layout_weight=".3"/>
227-
228-
<TextView
229-
android:layout_width="0dp"
230-
android:layout_height="wrap_content"
231-
android:layout_weight=".3"/>
232-
</LinearLayout>-->
233-
234-
<LinearLayout
235-
android:layout_width="match_parent"
236-
android:layout_height="wrap_content"
237-
android:orientation="horizontal"
238-
android:gravity="center_vertical"
239-
style="?android:buttonBarStyle">
212+
android:text="@string/history"
213+
android:textSize="@dimen/main_button"
214+
style="?android:attr/buttonBarButtonStyle"
215+
android:textStyle="bold"/>
240216

241217
<Button
242218
android:id="@+id/requestSend"
243-
android:layout_width="match_parent"
219+
android:layout_width="0dp"
220+
android:layout_weight=".5"
244221
android:layout_height="wrap_content"
245222
android:text="@string/request_taxi"
246223
android:textSize="@dimen/main_button"
247-
style="?android:attr/buttonBarButtonStyle"/>
224+
style="?android:attr/buttonBarButtonStyle"
225+
android:textStyle="bold"/>
248226

249227
</LinearLayout>
250228
</LinearLayout>

0 commit comments

Comments
 (0)