Skip to content

Commit de29a55

Browse files
sytolksytolk
committed
version 30
1 parent 6bcfa40 commit de29a55

19 files changed

Lines changed: 2748 additions & 324 deletions

‎.idea/libraries/Maven__com_taxi_bulgaria_rest_open_rest_client_1_0_4_BUILD_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: 2 additions & 2 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.28"
5-
android:versionCode="27"
4+
android:versionName="1.0.30"
5+
android:versionCode="29"
66
android:installLocation="auto">
77

88
<uses-sdk

‎TaxiAndroidOpen.apk‎

6.58 KB
Binary file not shown.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,42 +65,42 @@ public static BubbleOverlay_.IntentBuilder_ intent(Fragment supportFragment) {
6565
}
6666

6767
@Override
68-
public void showCarPosition(final Cars cars) {
68+
public void showRequests(final RequestCView requests) {
6969
handler_.post(new Runnable() {
7070

7171

7272
@Override
7373
public void run() {
74-
BubbleOverlay_.super.showCarPosition(cars);
74+
BubbleOverlay_.super.showRequests(requests);
7575
}
7676

7777
}
7878
);
7979
}
8080

8181
@Override
82-
public void showRequests(final RequestCView requests) {
82+
public void showCarPosition(final Cars cars) {
8383
handler_.post(new Runnable() {
8484

8585

8686
@Override
8787
public void run() {
88-
BubbleOverlay_.super.showRequests(requests);
88+
BubbleOverlay_.super.showCarPosition(cars);
8989
}
9090

9191
}
9292
);
9393
}
9494

9595
@Override
96-
public void showCar(final String carsNumber) {
96+
public void showMyRequests() {
9797
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
9898

9999

100100
@Override
101101
public void execute() {
102102
try {
103-
BubbleOverlay_.super.showCar(carsNumber);
103+
BubbleOverlay_.super.showMyRequests();
104104
} catch (Throwable e) {
105105
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
106106
}
@@ -111,14 +111,14 @@ public void execute() {
111111
}
112112

113113
@Override
114-
public void showMyRequests() {
114+
public void showCar(final String carsNumber) {
115115
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
116116

117117

118118
@Override
119119
public void execute() {
120120
try {
121-
BubbleOverlay_.super.showMyRequests();
121+
BubbleOverlay_.super.showCar(carsNumber);
122122
} catch (Throwable e) {
123123
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
124124
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ public static CarDetailsActivity_.IntentBuilder_ intent(Fragment supportFragment
7777

7878
@Override
7979
public void onViewChanged(HasViews hasViews) {
80+
driver = ((TextView) hasViews.findViewById(id.driver));
8081
carNumberView = ((TextView) hasViews.findViewById(id.carNumberView));
8182
requestButton = ((Button) hasViews.findViewById(id.requestButton));
82-
driver = ((TextView) hasViews.findViewById(id.driver));
8383
rating = ((RatingBar) hasViews.findViewById(id.rating));
8484
if (requestButton!= null) {
8585
requestButton.setOnClickListener(new OnClickListener() {

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,20 @@ public static EditRequestActivity_.IntentBuilder_ intent(Fragment supportFragmen
8787

8888
@Override
8989
public void onViewChanged(HasViews hasViews) {
90-
citiesPicker = ((AutoCompleteTextView) hasViews.findViewById(id.citiesPicker));
90+
region = ((TextView) hasViews.findViewById(id.region));
9191
destination = ((AutoCompleteTextView) hasViews.findViewById(id.destination));
92-
addressImage = ((ToggleButton) hasViews.findViewById(id.addressImage));
92+
address = ((TextView) hasViews.findViewById(id.address));
9393
requestSend = ((Button) hasViews.findViewById(id.requestSend));
9494
pbProgress = ((ProgressBar) hasViews.findViewById(id.pbProgress));
95-
address = ((TextView) hasViews.findViewById(id.address));
96-
reqInfoButtonContainer = ((LinearLayout) hasViews.findViewById(id.reqInfoButtonContainer));
97-
addressChange = ((Button) hasViews.findViewById(id.addressChange));
98-
region = ((TextView) hasViews.findViewById(id.region));
99-
addressText = ((EditText) hasViews.findViewById(id.addressText));
10095
llFilters = ((LinearLayout) hasViews.findViewById(id.llFilters));
96+
addressText = ((EditText) hasViews.findViewById(id.addressText));
97+
addressChange = ((Button) hasViews.findViewById(id.addressChange));
98+
destLayout = ((LinearLayout) hasViews.findViewById(id.destLayout));
99+
citiesPicker = ((AutoCompleteTextView) hasViews.findViewById(id.citiesPicker));
100+
reqInfoButtonContainer = ((LinearLayout) hasViews.findViewById(id.reqInfoButtonContainer));
101101
pricesPicker = ((Spinner) hasViews.findViewById(id.pricesPicker));
102102
regionsPicker = ((AutoCompleteTextView) hasViews.findViewById(id.regionsPicker));
103-
destLayout = ((LinearLayout) hasViews.findViewById(id.destLayout));
103+
addressImage = ((ToggleButton) hasViews.findViewById(id.addressImage));
104104
if (requestSend!= null) {
105105
requestSend.setOnClickListener(new OnClickListener() {
106106

@@ -158,27 +158,27 @@ public void run() {
158158
}
159159

160160
@Override
161-
public void showCities(final Contactaddress address) {
161+
public void SuccessDialog() {
162162
handler_.post(new Runnable() {
163163

164164

165165
@Override
166166
public void run() {
167-
EditRequestActivity_.super.showCities(address);
167+
EditRequestActivity_.super.SuccessDialog();
168168
}
169169

170170
}
171171
);
172172
}
173173

174174
@Override
175-
public void SuccessDialog() {
175+
public void showPrices(final Groups[] prices) {
176176
handler_.post(new Runnable() {
177177

178178

179179
@Override
180180
public void run() {
181-
EditRequestActivity_.super.SuccessDialog();
181+
EditRequestActivity_.super.showPrices(prices);
182182
}
183183

184184
}
@@ -214,28 +214,28 @@ public void run() {
214214
}
215215

216216
@Override
217-
public void showPrices(final Groups[] prices) {
217+
public void showCities(final Contactaddress address) {
218218
handler_.post(new Runnable() {
219219

220220

221221
@Override
222222
public void run() {
223-
EditRequestActivity_.super.showPrices(prices);
223+
EditRequestActivity_.super.showCities(address);
224224
}
225225

226226
}
227227
);
228228
}
229229

230230
@Override
231-
public void setRegions() {
231+
public void setRegionsByGN(final Integer gnId) {
232232
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
233233

234234

235235
@Override
236236
public void execute() {
237237
try {
238-
EditRequestActivity_.super.setRegions();
238+
EditRequestActivity_.super.setRegionsByGN(gnId);
239239
} catch (Throwable e) {
240240
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
241241
}
@@ -246,14 +246,14 @@ public void execute() {
246246
}
247247

248248
@Override
249-
public void setPrices() {
249+
public void setRegions() {
250250
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
251251

252252

253253
@Override
254254
public void execute() {
255255
try {
256-
EditRequestActivity_.super.setPrices();
256+
EditRequestActivity_.super.setRegions();
257257
} catch (Throwable e) {
258258
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
259259
}
@@ -264,14 +264,14 @@ public void execute() {
264264
}
265265

266266
@Override
267-
public void setRegionsByGN(final Integer gnId) {
267+
public void setGroups() {
268268
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
269269

270270

271271
@Override
272272
public void execute() {
273273
try {
274-
EditRequestActivity_.super.setRegionsByGN(gnId);
274+
EditRequestActivity_.super.setGroups();
275275
} catch (Throwable e) {
276276
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
277277
}
@@ -282,14 +282,14 @@ public void execute() {
282282
}
283283

284284
@Override
285-
public void setGroups() {
285+
public void setPrices() {
286286
BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0, "") {
287287

288288

289289
@Override
290290
public void execute() {
291291
try {
292-
EditRequestActivity_.super.setGroups();
292+
EditRequestActivity_.super.setPrices();
293293
} catch (Throwable e) {
294294
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
295295
}

0 commit comments

Comments
 (0)