From 7ad0c1f60fe694344351e249d2978b62accc2256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Sun, 9 Aug 2020 15:22:47 +0300
Subject: [PATCH] =?UTF-8?q?Selber=20Abholen=20Android=20=C3=B6n=20siparis?=
 =?UTF-8?q?=20hatasi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/caches/build_file_checksums.ser         | Bin 542 -> 542 bytes
 .../CreateOrderSummaryFragment.java           |  41 ++++++++++++------
 app/src/main/res/values/strings.xml           |   1 +
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index e7171f220a785694145d5dfcddf23ea383a803f5..21f6a9ee0650e51f5fba42a64233280853968cd2 100644
GIT binary patch
delta 15
XcmbQoGLL1#43<j|e)(^l)5Hh>H@62o

delta 15
XcmbQoGLL1#43_kZBDEXmG%*4IFL(wD

diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java
index b013eb6..adcf164 100644
--- a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -571,19 +571,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 break;
         }
 
-        if(orderYear == nowYear && orderMonth == nowMonth && orderDay == nowDay){
-            ArrayList<String> realPartsOfToday = new ArrayList<>();
-            for(String part : workingParts){
-                if(isPartAvailable(part)){
-                    realPartsOfToday.add(part);
-                }
-            }
-            if(!realPartsOfToday.isEmpty()){
-                workingParts.clear();
-                workingParts.addAll(realPartsOfToday);
-            }
-        }
-
         TimePickerDialog timePickerDialog =
                 TimePickerDialog.newInstance(
                         new TimePickerDialog.OnTimeSetListener() {
@@ -611,12 +598,38 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                         true
                 );
 
+        StringBuilder restaurantWorkingHoursMessageBuilder = new StringBuilder(getString(R.string.delivery_times_of_restaurant));
+        restaurantWorkingHoursMessageBuilder.append(" ");
+        for(String workingPart: workingParts){
+            restaurantWorkingHoursMessageBuilder.append(workingPart).append(", ");
+        }
+        String restaurantWorkingHoursMessage = restaurantWorkingHoursMessageBuilder.toString().substring(0, restaurantWorkingHoursMessageBuilder.toString().length() - 2);
+
+        /*
+        time point removed
+
+        if(orderYear == nowYear && orderMonth == nowMonth && orderDay == nowDay){
+            ArrayList<String> realPartsOfToday = new ArrayList<>();
+            for(String part : workingParts){
+                if(isPartAvailable(part)){
+                    realPartsOfToday.add(part);
+                }
+            }
+            if(!realPartsOfToday.isEmpty()){
+                workingParts.clear();
+                workingParts.addAll(realPartsOfToday);
+            }
+        }
 
         Timepoint[] enabledTimePoints = generateEnabledTimePoints(workingParts);
         timePickerDialog.setSelectableTimes(enabledTimePoints);
+         */
         timePickerDialog.vibrate(false);
+        timePickerDialog.setTitle(restaurantWorkingHoursMessage);
 
         if(isTheSameDate){
+            /*
+            time point removed
             boolean isMinimumTimeInTimePoints = false;
             for(Timepoint timepoint : enabledTimePoints){
                 if(timepoint.getHour() == nowHour && timepoint.getMinute() == nowMinute){
@@ -631,6 +644,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
             else if(enabledTimePoints.length > 0) {
                 timePickerDialog.setMinTime(enabledTimePoints[0].getHour(), enabledTimePoints[0].getMinute(), nowSecond);
             }
+            */
+            timePickerDialog.setMinTime(nowHour, nowMinute, nowSecond);
 
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15d3ffd..590c15e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,6 +195,7 @@
     <string name="andorid_pay_not_found">Android Pay konnte nicht finden.</string>
     <string name="choose_pick_up_date_time">Bitte wählen Sie aus wann Sie Ihre Bestellung abholen möchten.</string>
     <string name="info">Information</string>
+    <string name="delivery_times_of_restaurant">Lieferzeiten:</string>
     <string name="delivery_time_preference_message">Bitte wählen Sie die Zeit für den gewünschten Termin aus.</string>
     <string name="delivery_time_preference_as_soon_as_possible">so schnell wie möglich</string>
     <string name="delivery_time_preference_choose_delivery_time">Zeit auswählen</string>