Skip to content

Commit ca9fd66

Browse files
sytolksytolk
committed
version 25
1 parent fb16c46 commit ca9fd66

62 files changed

Lines changed: 3482 additions & 5515 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidManifest.xml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.opentaxi.android"
4-
android:versionName="1.0.24"
5-
android:versionCode="24"
4+
android:versionName="1.0.25"
5+
android:versionCode="25"
66
android:installLocation="auto">
77

88
<uses-sdk
@@ -164,6 +164,12 @@
164164
android:taskAffinity=""
165165
android:excludeFromRecents="true">
166166
</activity>
167+
<activity
168+
android:name=".HelpActivity_"
169+
android:allowTaskReparenting="false"
170+
android:taskAffinity=""
171+
android:excludeFromRecents="true">
172+
</activity>
167173

168174
<!--osmap-->
169175
<activity
@@ -199,6 +205,13 @@
199205
android:excludeFromRecents="true"
200206
android:theme="@android:style/Theme.Translucent.NoTitleBar">
201207
</activity>
208+
<!--<activity
209+
android:name="com.opentaxi.android.LongPressMapEditAction_"
210+
android:allowTaskReparenting="false"
211+
android:taskAffinity=""
212+
android:excludeFromRecents="true"
213+
android:theme="@android:style/Theme.Translucent.NoTitleBar">
214+
</activity>-->
202215

203216
<activity android:name="org.mapsforge.applications.android.filepicker.FilePicker"/>
204217
<activity android:name="org.mapsforge.applications.android.mapbg.Settings"/>
@@ -229,12 +242,9 @@
229242
</receiver>
230243

231244
<service android:name=".GcmIntentService"/>
232-
<!--<service android:name=".communication.TaxiDriverService" android:enabled="true"/>-->
233-
<!--<service android:name=".service.GPSService" android:process=":gps_coordinates" android:enabled="true"
234-
android:permission="android.permission.ACCESS_FINE_LOCATION"/>-->
235-
<!--<service android:name="com.opentaxitaxi.rest.LoginService"/>-->
245+
<service android:name=".service.CoordinatesService" />
236246

237-
<service android:name="com.littlefluffytoys.littlefluffylocationlibrary.LocationBroadcastService"/>
247+
<!--<service android:name="com.littlefluffytoys.littlefluffylocationlibrary.LocationBroadcastService"/>
238248
239249
<receiver
240250
android:name="com.littlefluffytoys.littlefluffylocationlibrary.PassiveLocationChangedReceiver"
@@ -246,7 +256,7 @@
246256
android:name="com.opentaxi.android.littlefluffylocationlibrary.LOCATION_CHANGED"
247257
android:exported="true"/>
248258
</intent-filter>
249-
</receiver>
259+
</receiver>-->
250260

251261
</application>
252262

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Using project dependencies:
1919

2020
[androidannotations](http://androidannotations.org/)
2121

22-
[little-fluffy-location-library](https://code.google.com/p/little-fluffy-location-library/)
22+
[android-reactive-location](https://github.com/mcharmas/Android-ReactiveLocation)
2323

2424
[mapsforge](http://code.google.com/p/mapsforge/)
2525

‎TaxiAndroidOpen.apk‎

21.2 KB
Binary file not shown.

‎TaxiAndroidOpen.iml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<content url="file://$MODULE_DIR$">
2222
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
2323
<sourceFolder url="file://$MODULE_DIR$/generated" isTestSource="false" />
24-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
2524
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
25+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
2626
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" />
2727
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
2828
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
@@ -32,8 +32,8 @@
3232
</content>
3333
<orderEntry type="sourceFolder" forTests="false" />
3434
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform" jdkType="Android SDK" />
35-
<orderEntry type="library" name="Maven: com.taxi-bulgaria.rest:open-rest-client-a:1.0.3.BUILD-SNAPSHOT" level="project" />
36-
<orderEntry type="library" name="Maven: com.taxi-bulgaria.rest:open-rest-client:1.0.3.BUILD-SNAPSHOT" level="project" />
35+
<orderEntry type="library" name="Maven: com.taxi-bulgaria.rest:open-rest-client-a:1.0.4.BUILD-SNAPSHOT" level="project" />
36+
<orderEntry type="library" name="Maven: com.taxi-bulgaria.rest:open-rest-client:1.0.4.BUILD-SNAPSHOT" level="project" />
3737
<orderEntry type="library" name="Maven: com.taxi-bulgaria.common:common:1.0.1-SNAPSHOT" level="project" />
3838
<orderEntry type="library" name="Maven: org.springframework.android:spring-android-rest-template:1.0.2.BUILD-SNAPSHOT" level="project" />
3939
<orderEntry type="library" name="Maven: org.springframework.android:spring-android-core:1.0.2.BUILD-SNAPSHOT" level="project" />
@@ -52,15 +52,9 @@
5252
<orderEntry type="library" name="Maven: org.mapsforge:mapsforge-map:0.4.3" level="project" />
5353
<orderEntry type="library" name="Maven: org.mapsforge:svg-android:0.4.3" level="project" />
5454
<orderEntry type="library" name="Maven: net.sf.kxml:kxml2:2.3.0" level="project" />
55-
<orderEntry type="module-library">
56-
<library name="Maven: com.littlefluffytoys.littlefluffylocationlibrary:littlefluffylocationlibrary:r15">
57-
<CLASSES>
58-
<root url="jar://$MODULE_DIR$/libs/littlefluffylocationlibrary_r15.jar!/" />
59-
</CLASSES>
60-
<JAVADOC />
61-
<SOURCES />
62-
</library>
63-
</orderEntry>
55+
<orderEntry type="library" name="Maven: pl.charmas.android:android-reactive-location:aar:0.2" level="project" />
56+
<orderEntry type="library" name="Maven: com.netflix.rxjava:rxjava-android:0.18.4" level="project" />
57+
<orderEntry type="library" name="Maven: com.netflix.rxjava:rxjava-core:0.18.4" level="project" />
6458
<orderEntry type="library" name="Maven: com.mobsandgeeks:android-saripaar:1.0.7-SNAPSHOT" level="project" />
6559
<orderEntry type="library" scope="PROVIDED" name="Maven: org.androidannotations:androidannotations:3.0.1" level="project" />
6660
<orderEntry type="library" name="Maven: org.androidannotations:androidannotations-api:3.0.1" level="project" />

‎doc/Такси България.pptx‎

779 KB
Binary file not shown.

‎generated/com/opentaxi/android/BubbleOverlay_.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import android.support.v4.app.Fragment;
1515
import android.view.View;
1616
import android.view.ViewGroup.LayoutParams;
17-
import com.opentaxi.generated.mysql.tables.pojos.Cars;
1817
import com.opentaxi.models.RequestCView;
18+
import com.stil.generated.mysql.tables.pojos.Cars;
1919
import org.androidannotations.api.BackgroundExecutor;
2020
import org.androidannotations.api.view.HasViews;
2121
import org.androidannotations.api.view.OnViewChangedNotifier;

‎generated/com/opentaxi/android/CarDetailsActivity_.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.widget.TextView;
2121
import com.opentaxi.android.R.id;
2222
import com.opentaxi.android.R.layout;
23-
import com.opentaxi.generated.mysql.tables.pojos.Cars;
23+
import com.stil.generated.mysql.tables.pojos.Cars;
2424
import org.androidannotations.api.BackgroundExecutor;
2525
import org.androidannotations.api.view.HasViews;
2626
import org.androidannotations.api.view.OnViewChangedListener;
@@ -77,9 +77,9 @@ public static CarDetailsActivity_.IntentBuilder_ intent(Fragment supportFragment
7777

7878
@Override
7979
public void onViewChanged(HasViews hasViews) {
80-
rating = ((RatingBar) hasViews.findViewById(id.rating));
81-
requestButton = ((Button) hasViews.findViewById(id.requestButton));
8280
carNumberView = ((TextView) hasViews.findViewById(id.carNumberView));
81+
requestButton = ((Button) hasViews.findViewById(id.requestButton));
82+
rating = ((RatingBar) hasViews.findViewById(id.rating));
8383
driver = ((TextView) hasViews.findViewById(id.driver));
8484
{
8585
View view = hasViews.findViewById(id.okButton);

‎generated/com/opentaxi/android/EditRequestActivity_.java‎

Lines changed: 56 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@
1616
import android.view.View;
1717
import android.view.View.OnClickListener;
1818
import android.view.ViewGroup.LayoutParams;
19+
import android.widget.AutoCompleteTextView;
1920
import android.widget.Button;
2021
import android.widget.EditText;
2122
import android.widget.LinearLayout;
2223
import android.widget.ProgressBar;
2324
import android.widget.Spinner;
2425
import android.widget.TextView;
26+
import android.widget.ToggleButton;
2527
import com.opentaxi.android.R.id;
2628
import com.opentaxi.android.R.layout;
27-
import com.opentaxi.generated.mysql.tables.pojos.Contactaddress;
28-
import com.opentaxi.generated.mysql.tables.pojos.Groups;
29-
import com.opentaxi.generated.mysql.tables.pojos.Regions;
3029
import com.opentaxi.models.NewCRequest;
3130
import com.opentaxi.models.NewRequestDetails;
31+
import com.stil.generated.mysql.tables.pojos.Contactaddress;
32+
import com.stil.generated.mysql.tables.pojos.Groups;
33+
import com.stil.generated.mysql.tables.pojos.Regions;
3234
import org.androidannotations.api.BackgroundExecutor;
3335
import org.androidannotations.api.view.HasViews;
3436
import org.androidannotations.api.view.OnViewChangedListener;
@@ -85,41 +87,43 @@ public static EditRequestActivity_.IntentBuilder_ intent(Fragment supportFragmen
8587

8688
@Override
8789
public void onViewChanged(HasViews hasViews) {
90+
region = ((TextView) hasViews.findViewById(id.region));
91+
addressText = ((EditText) hasViews.findViewById(id.addressText));
92+
llFilters = ((LinearLayout) hasViews.findViewById(id.llFilters));
93+
pricesPicker = ((Spinner) hasViews.findViewById(id.pricesPicker));
94+
destination = ((AutoCompleteTextView) hasViews.findViewById(id.destination));
95+
citiesPicker = ((AutoCompleteTextView) hasViews.findViewById(id.citiesPicker));
96+
reqInfoButtonContainer = ((LinearLayout) hasViews.findViewById(id.reqInfoButtonContainer));
8897
addressChange = ((Button) hasViews.findViewById(id.addressChange));
98+
regionsPicker = ((AutoCompleteTextView) hasViews.findViewById(id.regionsPicker));
8999
pbProgress = ((ProgressBar) hasViews.findViewById(id.pbProgress));
100+
addressImage = ((ToggleButton) hasViews.findViewById(id.addressImage));
90101
requestSend = ((Button) hasViews.findViewById(id.requestSend));
91102
address = ((TextView) hasViews.findViewById(id.address));
92-
llFilters = ((LinearLayout) hasViews.findViewById(id.llFilters));
93-
regionsPicker = ((Spinner) hasViews.findViewById(id.regionsPicker));
94-
reqInfoButtonContainer = ((LinearLayout) hasViews.findViewById(id.reqInfoButtonContainer));
95-
addressText = ((EditText) hasViews.findViewById(id.addressText));
96-
citiesPicker = ((EditText) hasViews.findViewById(id.citiesPicker));
97-
region = ((TextView) hasViews.findViewById(id.region));
98-
pricesPicker = ((Spinner) hasViews.findViewById(id.pricesPicker));
99103
{
100-
View view = hasViews.findViewById(id.requestSend);
104+
View view = hasViews.findViewById(id.addressChange);
101105
if (view!= null) {
102106
view.setOnClickListener(new OnClickListener() {
103107

104108

105109
@Override
106110
public void onClick(View view) {
107-
EditRequestActivity_.this.requestSend();
111+
EditRequestActivity_.this.addressChange();
108112
}
109113

110114
}
111115
);
112116
}
113117
}
114118
{
115-
View view = hasViews.findViewById(id.addressChange);
119+
View view = hasViews.findViewById(id.requestSend);
116120
if (view!= null) {
117121
view.setOnClickListener(new OnClickListener() {
118122

119123

120124
@Override
121125
public void onClick(View view) {
122-
EditRequestActivity_.this.addressChange();
126+
EditRequestActivity_.this.requestSend();
123127
}
124128

125129
}
@@ -144,6 +148,16 @@ public void setIntent(Intent newIntent) {
144148
injectExtras_();
145149
}
146150

151+
@Override
152+
public void onActivityResult(int requestCode, int resultCode, Intent data) {
153+
super.onActivityResult(requestCode, resultCode, data);
154+
switch (requestCode) {
155+
case 990 :
156+
EditRequestActivity_.this.onResult(resultCode, data);
157+
break;
158+
}
159+
}
160+
147161
@Override
148162
public void showGroups(final Groups[] groups) {
149163
handler_.post(new Runnable() {
@@ -159,13 +173,13 @@ public void run() {
159173
}
160174

161175
@Override
162-
public void SuccessDialog() {
176+
public void showCities(final Contactaddress address) {
163177
handler_.post(new Runnable() {
164178

165179

166180
@Override
167181
public void run() {
168-
EditRequestActivity_.super.SuccessDialog();
182+
EditRequestActivity_.super.showCities(address);
169183
}
170184

171185
}
@@ -187,13 +201,27 @@ public void run() {
187201
}
188202

189203
@Override
190-
public void showCities(final Contactaddress address) {
204+
public void ErrorDialog() {
191205
handler_.post(new Runnable() {
192206

193207

194208
@Override
195209
public void run() {
196-
EditRequestActivity_.super.showCities(address);
210+
EditRequestActivity_.super.ErrorDialog();
211+
}
212+
213+
}
214+
);
215+
}
216+
217+
@Override
218+
public void SuccessDialog() {
219+
handler_.post(new Runnable() {
220+
221+
222+
@Override
223+
public void run() {
224+
EditRequestActivity_.super.SuccessDialog();
197225
}
198226

199227
}
@@ -215,14 +243,14 @@ public void run() {
215243
}
216244

217245
@Override
218-
public void setCities() {
246+
public void sendRequest(final NewRequestDetails newRequest) {
219247
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
220248

221249

222250
@Override
223251
public void execute() {
224252
try {
225-
EditRequestActivity_.super.setCities();
253+
EditRequestActivity_.super.sendRequest(newRequest);
226254
} catch (Throwable e) {
227255
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
228256
}
@@ -233,14 +261,14 @@ public void execute() {
233261
}
234262

235263
@Override
236-
public void setRegions() {
264+
public void setPrices() {
237265
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
238266

239267

240268
@Override
241269
public void execute() {
242270
try {
243-
EditRequestActivity_.super.setRegions();
271+
EditRequestActivity_.super.setPrices();
244272
} catch (Throwable e) {
245273
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
246274
}
@@ -251,14 +279,14 @@ public void execute() {
251279
}
252280

253281
@Override
254-
public void setGroups() {
282+
public void setRegions() {
255283
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
256284

257285

258286
@Override
259287
public void execute() {
260288
try {
261-
EditRequestActivity_.super.setGroups();
289+
EditRequestActivity_.super.setRegions();
262290
} catch (Throwable e) {
263291
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
264292
}
@@ -269,14 +297,14 @@ public void execute() {
269297
}
270298

271299
@Override
272-
public void setPrices() {
300+
public void setGroups() {
273301
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
274302

275303

276304
@Override
277305
public void execute() {
278306
try {
279-
EditRequestActivity_.super.setPrices();
307+
EditRequestActivity_.super.setGroups();
280308
} catch (Throwable e) {
281309
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
282310
}
@@ -287,14 +315,14 @@ public void execute() {
287315
}
288316

289317
@Override
290-
public void sendRequest(final NewRequestDetails newRequest) {
318+
public void setCities() {
291319
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
292320

293321

294322
@Override
295323
public void execute() {
296324
try {
297-
EditRequestActivity_.super.sendRequest(newRequest);
325+
EditRequestActivity_.super.setCities();
298326
} catch (Throwable e) {
299327
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
300328
}

‎generated/com/opentaxi/android/LongPressMapAction_.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import android.view.View.OnClickListener;
1818
import android.view.ViewGroup.LayoutParams;
1919
import com.opentaxi.android.R.id;
20-
import com.opentaxi.generated.mysql.tables.pojos.NewRequest;
20+
import com.stil.generated.mysql.tables.pojos.NewRequest;
2121
import org.androidannotations.api.BackgroundExecutor;
2222
import org.androidannotations.api.view.HasViews;
2323
import org.androidannotations.api.view.OnViewChangedListener;

0 commit comments

Comments
 (0)