Skip to content

Commit 18ffc05

Browse files
committed
API 14
1 parent 0ffa9b5 commit 18ffc05

13 files changed

Lines changed: 65 additions & 33 deletions

TaxiAndroidOpen.apk

4.24 KB
Binary file not shown.

TaxiAndroidOpen.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
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" />
4039
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
4140
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" />
4241
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />

res/layout/contacts.xml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,39 @@
33
android:orientation="vertical"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
android:divider="?android:dividerHorizontal"
76
android:showDividers="middle"
8-
android:theme="@style/BlackTextViewStyle">
7+
android:paddingTop="@dimen/activity_vertical_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingLeft="@dimen/activity_horizontal_margin">
910

1011
<TextView
1112
android:layout_width="wrap_content"
1213
android:layout_height="wrap_content"
1314
android:layout_gravity="center"
14-
android:text="@string/contactText"/>
15+
android:textColor="@color/black_color"
16+
android:textStyle="bold"
17+
android:text="@string/contactText"
18+
android:paddingBottom="@dimen/activity_vertical_margin"/>
1519

1620
<EditText
1721
android:id="@+id/contactForm"
1822
android:layout_width="fill_parent"
19-
android:layout_height="0px"
20-
android:layout_weight="1"
23+
android:layout_height="0dip"
2124
android:inputType="textMultiLine"
22-
android:lines="5">
25+
android:layout_weight="1"
26+
android:gravity="top|start"
27+
android:scrollbars="vertical"
28+
android:imeOptions="actionSend">
2329
<requestFocus/>
24-
</EditText>
30+
</EditText> <!--android:lines="10"-->
2531

2632
<LinearLayout android:layout_width="match_parent"
2733
android:layout_height="wrap_content"
2834
android:orientation="horizontal"
2935
android:gravity="center_vertical"
3036
style="?android:buttonBarStyle">
3137

32-
<Button android:id="@+id/sendButton"
38+
<Button android:id="@+id/sendContactsButton"
3339
android:layout_width="fill_parent"
3440
android:layout_height="wrap_content"
3541
android:text="@string/send"

res/menu/activity_main_drawer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<item android:id="@+id/options_help"
2222
android:title="@string/options_help"/>
2323
<item android:id="@+id/options_feedback"
24-
android:title="@string/feedback"/>
24+
android:title="@string/for_contacts"/>
2525
<item android:id="@+id/nav_send_log"
2626
android:title="@string/options_send_log"/>
2727
<item android:id="@+id/nav_exit"

res/values-bg/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<string name="NEW_REQUEST_DELETE">Изтрита</string>
3131
<string name="NEW_REQUEST_SCHEDULED">Планирана поръчка</string>
3232
<string name="ERROR_NO_FREE_CARS">Няма свободни коли</string>
33+
<string name="ERROR_INVALID_REQUEST">Грешка невалиден адрес</string>
3334

3435
<string name="new_version">Налична нова версия</string>
3536

@@ -167,4 +168,5 @@
167168
<string name="carRating">Рейтинг на колата:</string>
168169
<string name="no_active_request">Нямате активни поръчки</string>
169170
<string name="contactText">Вашето мнение е много важно за нас. Ние ценим Вашето мнение и ще го използваме за да направим подобрения в нашата услуга.</string>
171+
<string name="for_contacts">За контакти</string>
170172
</resources>

res/values-ru/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<string name="NEW_REQUEST_DELETE">Удаленные</string>
3131
<string name="NEW_REQUEST_SCHEDULED">Запланированные запрос</string>
3232
<string name="ERROR_NO_FREE_CARS">Нет доступных такси</string>
33+
<string name="ERROR_INVALID_REQUEST">Ошибка неверный адрес</string>
3334

3435
<string name="new_version">Новая версия</string>
3536

@@ -166,4 +167,5 @@
166167
<string name="carRating">Рейтинг машине:</string>
167168
<string name="no_active_request">Нет активных заказов</string>
168169
<string name="contactText">Ваше мнение очень важно для нас. Мы ценим ваше мнение и будет использовать его, чтобы сделать улучшения в нашем сервисе.</string>
170+
<string name="for_contacts">Контакт</string>
169171
</resources>

res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<string name="NEW_REQUEST_DELETE">Deleted</string>
4141
<string name="NEW_REQUEST_SCHEDULED">Scheduled request</string>
4242
<string name="ERROR_NO_FREE_CARS">No free cars</string>
43+
<string name="ERROR_INVALID_REQUEST">Error invalid address</string>
4344

4445
<string name="new_version">New version available</string>
4546

@@ -158,4 +159,5 @@
158159
<string name="carRating">Car Rating:</string>
159160
<string name="no_active_request">No Active Requests</string>
160161
<string name="contactText">Your opinion is very important to us. We appreciate your feedback and will use it to make improvements in our service.</string>
162+
<string name="for_contacts">Feedback</string>
161163
</resources>

src/com/opentaxi/android/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public void onDrawerClosed(View view) {
236236

237237
MenuItem navMap = navMenu.findItem(R.id.nav_map);
238238
if (navMap != null)
239-
navMap.setIcon(new IconDrawable(this, MaterialIcons.md_map).colorRes(R.color.app_primary_dark).sizeDp(30));
239+
navMap.setIcon(new IconDrawable(this, MaterialIcons.md_map).colorRes(R.color.label_color).sizeDp(30));
240240
//navMap.setIcon(new IconicsDrawable(this, GoogleMaterial.Icon.gmd_map).actionBar().colorRes(R.color.app_primary_dark));
241241

242242
MenuItem navRequest = navMenu.findItem(R.id.nav_request);
@@ -261,7 +261,7 @@ public void onDrawerClosed(View view) {
261261

262262
MenuItem navFeedBack = navMenu.findItem(R.id.options_feedback);
263263
if (navFeedBack != null)
264-
navFeedBack.setIcon(new IconDrawable(this, MaterialIcons.md_contacts).colorRes(R.color.timebase_color).sizeDp(30));
264+
navFeedBack.setIcon(new IconDrawable(this, MaterialIcons.md_contacts).colorRes(R.color.blue_color).sizeDp(30));
265265

266266
MenuItem navLog = navMenu.findItem(R.id.nav_send_log);
267267
if (navLog != null)

src/com/opentaxi/android/MessageActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void afterViews() {
6161
okButton.setText(R.string.okbutton);
6262
yesButton.setVisibility(View.GONE);
6363

64-
dimDisplay();
64+
//dimDisplay();
6565
} else if (requestDetails != null) {
6666

6767
if (RequestStatus.NEW_REQUEST_DELETE.getCode().equals(requestDetails.getStatus())) { //DELETE REQUEST

src/com/opentaxi/android/TaxiApplication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class TaxiApplication extends Application { //extends MultiDexApplication
2323
//private static boolean havePlayService = true;
2424
private static boolean requestsVisible = false;
2525
//private static boolean requestsHistory = false;
26-
private static boolean requestsDetailsVisible = false;
26+
//private static boolean requestsDetailsVisible = false;
2727
private static boolean userPassVisible = false;
2828
private static boolean mapVisible = false;
2929
private static Integer lastRequestId;
@@ -52,7 +52,7 @@ public static void requestsPaused() {
5252
requestsVisible = false;
5353
}
5454

55-
public static boolean isRequestsDetailsVisible() {
55+
/*public static boolean isRequestsDetailsVisible() {
5656
return requestsDetailsVisible;
5757
}
5858
@@ -62,7 +62,7 @@ public static void requestsDetailsResumed() {
6262
6363
public static void requestsDetailsPaused() {
6464
requestsDetailsVisible = false;
65-
}
65+
}*/
6666

6767
public static boolean isUserPassVisible() {
6868
return userPassVisible;

0 commit comments

Comments
 (0)