Merge remote-tracking branch 'origin/NewDialogChangeAC' into NewDialogChangeAC

GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:weightSum="1">
 
-    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <android.support.v7.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -54,7 +55,7 @@
                     android:padding="10dp"
                     android:text="Category List"
                     android:textAppearance="?android:textAppearanceSmall"
-                    android:textColor="#f2711f"
+                    android:textColor="@color/colorPrimaryDark"
                     android:textStyle="bold" />
             </LinearLayout>
         </LinearLayout>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -159,9 +159,9 @@
     <string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
     <string name="title_store_list_checkout_current">Lütfen önce mağazadan çık</string>
     <string name="title_store_list_checkout_Already_filled">Doldurulmuş veriler</string>
-    <string name="NetworkError">Bağlantı kurulamıyor ,</string>
-    <string name="uploadeddata">Veriler Paylaşılıyor ,</string>
-    <string name="DataNot">Veriler Paylaşılmadı ,</string>
+    <string name="NetworkError">Bağlantı kurulamıyor</string>
+    <string name="uploadeddata">Veriler Paylaşılıyor</string>
+    <string name="DataNot">Veriler Paylaşılmadı</string>
     <string name="delete">Sil</string>
     <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
     <string name="displayname">Teşhir Türü</string>

GSKMTOrange/src/main/res/values/strings.xml

@@ -224,6 +224,9 @@
     <string name="data_downloaded_successfully">Data downloaded successfully</string>
     <string name="export_database">Export Database</string>
     <string name="data_exported_successfully">Database Exported Successfully</string>
+
+    <string name="uploadeddata">Uploaded Data</string>
+
     <string name="previous_data_upload">Please Upload Previous Data First</string>
     <string name="error">Error Uploading</string>
 </resources>