[Telegram] Modify the registration view 71/49571/2
authormoon87.park <moon87.park@samsung.com>
Thu, 15 Oct 2015 06:33:37 +0000 (15:33 +0900)
committermoon87.park <moon87.park@samsung.com>
Thu, 15 Oct 2015 07:19:11 +0000 (16:19 +0900)
Change-Id: I03859a84be28adadeee2ae11f6ea62924d2ddc67

TelegramTizen/res/edje/telegram_init_screen.edc
TelegramTizen/src/tg_first_registration.c
TelegramTizen/src/tg_init_screen.c
TelegramTizen/src/tg_login.c
TelegramTizen/src/tg_registration.c
TelegramTizen/tg_utils/tg_common.h

index cdd26f1..4897f5f 100644 (file)
@@ -1,5 +1,22 @@
 
-
+styles {
+       style {
+               name: "text,display";
+               base: "font=Tizen=Regular text_class=ATO022 font_size=36 align=left color=#000000 color_class=ATO022 wrap=mixed";
+               tag:  "br" "\n";
+               tag:  "hilight" "+ font=Tizen:style=Bold";
+               tag:  "b" "+ font=Tizen:style=Bold";
+               tag:  "tab" "\t";
+       }
+       style {
+               name: "call,display";
+               base: "font=Tizen=Regular text_class=ATO023 font_size=32 align=left color=#999999 color_class=ATO023 wrap=mixed";
+               tag:  "br" "\n";
+               tag:  "hilight" "+ font=Tizen:style=Bold";
+               tag:  "b" "+ font=Tizen:style=Bold";
+               tag:  "tab" "\t";
+       }
+}
 
 collections {
 
@@ -24,7 +41,7 @@ collections {
                        align: 0.0 0.0; \
                } \
        }
-       
+
        #define PADDING_TOP(param_padding_name, param_padding_size) \
        part \
        { \
@@ -108,7 +125,7 @@ collections {
       parts {
          part {
                name: "main_image";
-            type: SWALLOW;            
+            type: SWALLOW;
             description {
                state: "default" 0.0;
                        rel1 { relative: -0.1 -0.1; }
@@ -117,267 +134,448 @@ collections {
          }
                part {
                name: "start_btn";
-            type: SWALLOW;            
+            type: SWALLOW;
             description {
                state: "default" 0.0;
                        rel1 { relative: 0.2 0.4; }
-                       rel2 { relative: 0.8 0.55; }                                    
+                       rel2 { relative: 0.8 0.55; }
             }
          }
          part {
                name: "button_box_bg";
-            type: RECT;            
+            type: RECT;
             description {
                state: "default" 0.0;
                        rel1 { relative: 0.0 0.9; }
                        rel2 { relative: 1.0 1.0; }
-                       color: 255 255 255 255;                                 
+                       color: 255 255 255 255;
             }
          }
          part {
                name: "button_box";
-            type: SWALLOW;            
+            type: SWALLOW;
             description {
                state: "default" 0.0;
                        rel1 { relative: 0.0 0.9; }
-                       rel2 { relative: 1.0 1.0; }                                     
+                       rel2 { relative: 1.0 1.0; }
             }
          }
       }
    }
-   
+
    group {
          name: "bg_screen";
                 parts {
                part {
                name: "country_name";
-            type: SWALLOW;            
+            type: SWALLOW;
                description {
                        state: "default" 0.0;
                                rel1 { relative: 0.1 0.1; }
-                               rel2 { relative: 0.9 0.3; }       
-               }         
+                               rel2 { relative: 0.9 0.3; }
+               }
                        }
                }
    }
-   
+
    group {
          name: "registration_screen";
       parts {
           part {
                name: "screen_bg";
-            type: RECT;            
+            type: RECT;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.0 0.0; }
-                       rel2 { relative: 1.0 1.0; }
-                       color: 255 255 255 255;
+              rel1 { relative: 0.0 0.0; }
+              rel2 { relative: 1.0 1.0; }
+              color: 255 255 255 0;
+            }
+         }
+        part {
+               name: "country_name,bg";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 0.0 0.0; to_y: "country_name"; }
+              rel2 { relative: 1.0 1.0; to_y: "country_name"; }
+              color: 255 255 255 255;
+              align: 0.5 0.5;
             }
          }
          part {
                name: "country_name";
             type: SWALLOW;
-            scale: 1;            
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.1; }
-                       rel2 { relative: 0.9 0.2; }
+              rel1 { relative: 32/720 0.0; }
+              rel2 { relative: 703/720 0.0; offset: 0 130; }
+              align: 0.5 0.5;
             }
          }
-         part {
+        part {
                name: "country_code,bg";
             type: RECT;
-            scale: 1;            
+            scale: 1;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 0.0 1.0; to_y: "country_name"; }
+              rel2 { relative: 1.0 1.0; to_y: "country_name"; offset: 0 160; }
+              color: 242 247 249 255;
+              align: 0.5 0.5;
+            }
+         }
+        part {
+               name: "text,bg";
+            type: RECT;
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.25; }
-                       rel2 { relative: 0.3 0.35; }
-                       color: 220 220 220 255;                         
+              rel1 { relative: 0.0 1.0; to_y: "country_code,bg"; }
+              rel2 { relative: 1.0 1.0; }
+              color: 234 243 248 255;
+              align: 0.5 0.5;
             }
          }
                part {
                name: "country_code";
             type: SWALLOW;
-            scale: 1;            
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.25; }
-                       rel2 { relative: 0.3 0.35; }
+              rel1 { relative: 32/720 1.0; to_y: "country_name"; }
+              rel2 { relative: 184/720 1.0; to_y: "country_name"; offset: 0 160; }
+              fixed: 0 1;
+              align: 0.5 0.5;
             }
          }
          part {
-               name: "phone_number_entry,bg";
+               name: "code_underline";
             type: RECT;
-            scale: 1;            
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.32 0.25; }
-                       rel2 { relative: 0.9 0.35; }
-                       color: 220 220 220 255;
+              rel1 { relative: 0.0 1.0; to: "country_code"; }
+              rel2 { relative: 1.0 1.0; to: "country_code"; }
+              fixed: 0 1;
+              min: 0 1;
+              color: 128 128 128 76;
+              align: 0.5 0.5;
             }
          }
-
          part {
                name: "phone_number_entry";
             type: SWALLOW;
-            scale: 1;            
+            scale: 1;
             description {
                state: "default" 0.0;
                fixed: 1 1;
-               align: 0.0 0.5;
-                       rel1 { relative: 0.32 0.25; }
-                       rel2 { relative: 0.9 0.35; }
+               align: 0.5 0.5;
+              rel1 { relative: 216/720 1.0; to_y: "country_name"; }
+              rel2 { relative: 594/720 1.0; to_y: "country_name"; offset: 0 160; }
             }
          }
 
          part {
-               name: "text_display";
+               name: "phone_number_delete";
             type: SWALLOW;
-            scale: 1;            
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.13 0.45; }
-                       rel2 { relative: 0.87 0.65; }
+               align: 0.5 0.5;
+              rel1 { relative: 570/720 1.0; to_y: "country_name"; }
+              rel2 { relative: 1.0 1.0; to_y: "country_name"; offset: 0 160; }
+              visible: 0;
+            }
+            description {
+               state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         
+        part {
+               name: "number_underline";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 0.0 1.0; to: "phone_number_entry"; }
+              rel2 { relative: 1.0 1.0; to: "phone_number_entry"; }
+              fixed: 0 1;
+              min: 0 1;
+              color: 61 185 204 255;
+              align: 0.5 0.5;
+            }
+         }
+               part {
+                       name: "text_display";
+                       type: TEXTBLOCK;
+                       description {
+                               state: "default" 0.0;
+                               rel1 { relative: 32/720 1.0; to_y: "country_code,bg"; offset: 0 30; }
+                               rel2 { relative: 32/720 1.0; to_y: "country_code,bg"; offset: 0 30; }
+                               align: 0.0 0.0;
+                               fixed: 1 1;
+                               min: 656 96;
+                               max: 656 96;
+                               text {
+                                       style: "text,display";
+                                       min: 0 1;
+                                       text: "Confirm.";
+                               }
+                       }
+               }
       }
-   }
-   
-   
+      programs {
+                       program {
+                               name: "delete,hide";
+                               signal: "hide";
+                               source: "delete";
+                               action: STATE_SET "default" 0.0;
+                               target: "phone_number_delete";
+                       }
+                       program {
+                               name: "delete,show";
+                               signal: "show";
+                               source: "delete";
+                               action: STATE_SET "show" 0.0;
+                               target: "phone_number_delete";
+                       }
+               }
+   } //registration_screen
+
    group {
          name: "code_check_screen";
       parts {
           part {
                name: "screen_bg";
-            type: RECT;            
+            type: RECT;
             description {
                state: "default" 0.0;
                        rel1 { relative: 0.0 0.0; }
                        rel2 { relative: 1.0 1.0; }
-                       color: 255 255 255 255;
+                       color: 255 255 255 0;
             }
          }
          part {
-               name: "phone_status";
-            type: SWALLOW;            
+               name: "phone_status,bg";
+            type: RECT;
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.02; }
-                       rel2 { relative: 0.91 0.08; }
-                       color: 222 222 222 222;
+              rel1 { relative: 0.0 0.0; to_y: "phone_status"; }
+              rel2 { relative: 1.0 1.0; to_y: "phone_status"; }
+              color: 255 255 255 255;
+              align: 0.5 0.5;
             }
          }
+         part {
+                               name: "phone_status";
+                               type: TEXT;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 0;
+                                       rel1 { relative: 32/720 0.0; }
+                       rel2 { relative: 688/720 0.0; offset: 0 130; }
+                                       align: 0.5 0.5;
+                                       color: 0 0 0 255;
+                                       text {
+                                               min: 0 1;
+                                               size: 48;
+                                               text: "";
+                                               align: 0.0 0.5;
+                                       }
+                               }
+                       }
         part {
                name: "code_entry,bg";
-            type: RECT;            
+            type: RECT;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.1; }
-                       rel2 { relative: 0.9 0.2; }
-                       color: 222 222 222 222;                                 
+              rel1 { relative: 0.0 1.0; to_y: "phone_status"; }
+              rel2 { relative: 1.0 1.0; to_y: "phone_status"; offset: 0 160; }
+              color: 242 247 249 255;
             }
         }
                part {
                name: "code_entry";
-            type: SWALLOW;            
+            type: SWALLOW;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.1; }
-                       rel2 { relative: 0.9 0.2; }
+              rel1 { relative: 32/720 0.0; to_y: "code_entry,bg"; }
+              rel2 { relative: 688/720 1.0; to_y: "code_entry,bg"; offset: 0 -10; }
             }
          }
-         
          part {
-               name: "timer_text";
-            type: SWALLOW;            
+               name: "code_underline";
+            type: RECT;
+            scale: 1;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.25; }
-                       rel2 { relative: 0.8 3; }
-                       color: 222 222 222 222;                                 
+              rel1 { relative: 0.0 1.0; to: "code_entry"; }
+              rel2 { relative: 1.0 1.0; to: "code_entry"; }
+              fixed: 0 1;
+              min: 0 1;
+              color: 61 185 204 255;
+              align: 0.5 0.5;
             }
          }
-         
          part {
-               name: "wrong_num_btn";
-            type: SWALLOW;            
+               name: "inform,bg";
+            type: RECT;
             description {
                state: "default" 0.0;
-                       rel1 { relative: 0.1 0.35; }
-                       rel2 { relative: 0.9 0.4; }
-                       color: 222 222 222 222;                                 
+              rel1 { relative: 0.0 1.0; to_y: "code_entry"; }
+              rel2 { relative: 1.0 1.0; }
+              color: 234 243 248 255;
             }
-         }
-         
-      }
-   }
-   
+        }
+         part {
+                               name: "inform";
+                               type: TEXTBLOCK;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 0;
+                                       rel1 { relative: 32/720 0.0; to_y: "inform,bg"; offset: 0 30; }
+                       rel2 { relative: 688/720 0.0; to_y: "inform,bg"; offset: 0 160; }
+                                       align: 0.5 0.5;
+                                       text {
+                                               style: "text,display";
+                                               min: 0 1;
+                                               text: "we have sent you an SMS";
+                                       }
+                               }
+                       }
+         part {
+                               name: "timer_text";
+                               type: TEXTBLOCK;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 0;
+                       rel1 { relative: 32/720 1.0; to_y: "inform"; }
+                       rel2 { relative: 688/720 1.0; to_y: "inform"; offset: 0 130; }
+                                       align: 0.5 0.5;
+                                       text {
+                                               style: "call,display";
+                                               min: 0 1;
+                                               text: "telegram will call you in";
+                                       }
+                               }
+                       }
+      } //parts
+   } //code check group
+
        group {
          name: "name_reg_screen";
                parts {
                    part {
                        name: "name_reg_screen_bg";
-                       type: RECT;            
+                       type: RECT;
                        description {
                                state: "default" 0.0;
                        rel1 { relative: 0.0 0.0; }
                        rel2 { relative: 1.0 1.0; }
+                       color: 255 255 255 0;
                        }
                }
                part {
-                       name: "setup_guide_text";
-                       type: SWALLOW;            
-                       description {
-                               state: "default" 0.0;
-                       rel1 { relative: 0.1 0.2; }
-                       rel2 { relative: 0.9 0.25; }
-                       }
-               }
-               part {
-                       name: "first_name_entry,bg";
-                       type: RECT;            
-                       description {
-                       state: "default" 0.0;
-                       rel1 { relative: 0.1 0.26; }
-                       rel2 { relative: 0.9 0.36; }
-                       color: 222 222 222 222;                                 
-                       }
-               }
-      
-               part {
-                       name: "first_name_entry";
-                       type: SWALLOW;            
-                       description {
-                               state: "default" 0.0;
-                       rel1 { relative: 0.1 0.26; }
-                       rel2 { relative: 0.9 0.36; }
-                       }
-               }
-               part {
-                       name: "second_name_entry,bg";
-                       type: RECT;            
-                       description {
-                               state: "default" 0.0;
-                       rel1 { relative: 0.1 0.39; }
-                       rel2 { relative: 0.9 0.49; }
-                       color: 222 222 222 222;                                 
-                       }
+                       name: "inform,bg";
+                       type: RECT;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 { relative: 0.0 0.0; to_y: "inform"; }
+                               rel2 { relative: 1.0 1.0; to_y: "inform"; }
+                               color: 255 255 255 255;
+                               align: 0.5 0.5;
+                       }
                }
                part {
-               name: "second_name_entry";
-                       type: SWALLOW;            
-                       description {
-                               state: "default" 0.0;
-                       rel1 { relative: 0.1 0.39; }
-                       rel2 { relative: 0.9 0.49; }
-                        }
-               }
-      
-               }
-       }
-       
-       
+                               name: "inform";
+                               type: TEXTBLOCK;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 0;
+                                       rel1 { relative: 32/720 0.0; }
+                       rel2 { relative: 688/720 0.0; offset: 0 160; }
+                                       align: 0.5 0.5;
+                                       text {
+                                               style: "text,display";
+                                               min: 0 1;
+                                               text: "we have sent you an SMS";
+                                       }
+                               }
+                       }
+                       part {
+                 name: "first_name_entry,bg";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 0.0 1.0; to_y: "inform"; }
+              rel2 { relative: 1.0 1.0; to_y: "inform"; offset: 0 160; }
+              color: 242 247 249 255;
+            }
+        }
+               part {
+               name: "first_name_entry";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 32/720 0.0; to_y: "first_name_entry,bg"; }
+              rel2 { relative: 688/720 1.0; to_y: "first_name_entry,bg"; offset: 0 -10; }
+            }
+         }
+         part {
+               name: "first_underline";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 0.0 1.0; to: "first_name_entry"; }
+              rel2 { relative: 1.0 1.0; to: "first_name_entry"; }
+              fixed: 0 1;
+              min: 0 1;
+              color: 61 185 204 255;
+              align: 0.5 0.5;
+            }
+         }
+         part {
+               name: "second_name_entry,bg";
+            type: RECT;
+            description {
+            state: "default" 0.0;
+              rel1 { relative: 0.0 1.0; to_y: "first_name_entry,bg"; }
+              rel2 { relative: 1.0 1.0; }
+              color: 234 243 248 255;
+            }
+        }
+       part {
+               name: "second_name_entry";
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 32/720 0.0; to_y: "second_name_entry,bg"; }
+              rel2 { relative: 688/720 0.0; to_y: "second_name_entry,bg"; offset: 0 150; }
+            }
+         }
+         part {
+               name: "second_underline";
+            type: RECT;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+              rel1 { relative: 0.0 1.0; to: "second_name_entry"; }
+              rel2 { relative: 1.0 1.0; to: "second_name_entry"; }
+              fixed: 0 1;
+              min: 0 1;
+              color: 61 185 204 255;
+              align: 0.5 0.5;
+            }
+         }
+               } //parts
+       } //first name group
+
        group {
          name: "user_main_screen";
                parts {
index ec49ed6..41ff715 100644 (file)
@@ -8,8 +8,6 @@
 #include "server_requests.h"
 #include "tg_user_main_view.h"
 
-#define NAME_INFO_TEXT "Set up your first and last name"
-
 static void on_first_name_change_enable_ok_button(void *data, Evas_Object *obj, void *event_info)
 {
        appdata_s* ad = data;
@@ -26,6 +24,13 @@ static void on_first_name_change_enable_ok_button(void *data, Evas_Object *obj,
        free(org_buf);
 }
 
+static void on_naviframe_cancel_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+       appdata_s* ad = data;
+       elm_win_lower(ad->win);
+       elm_exit();
+}
+
 static void on_name_entry_done_clicked(void *data, Evas_Object *obj, void *event_info)
 {
        appdata_s* ad = data;
@@ -76,30 +81,14 @@ void launch_first_registration_cb(appdata_s *ad)
        evas_object_show(layout);
        elm_object_content_set(scroller, layout);
 
-       char* info_txt = NULL;
-       info_txt = (char*)malloc(strlen(NAME_INFO_TEXT) + 1);
-       strcpy(info_txt, NAME_INFO_TEXT);
-
-       char temp_txt[512] = {0,};
-       snprintf(temp_txt, sizeof(temp_txt), "<font=Tizen:style=Regular color=#666362 align=left><font_size=32>%s</font_size></font>", info_txt);
-       free(info_txt);
-
-       Evas_Object* info_btn = elm_entry_add(layout);
-       elm_object_text_set(info_btn, temp_txt);
-       evas_object_size_hint_weight_set(info_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(info_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_entry_single_line_set(info_btn,  EINA_FALSE);
-       elm_entry_editable_set(info_btn, EINA_FALSE);
-       elm_entry_line_wrap_set(info_btn, EINA_TRUE);
-       evas_object_show(info_btn);
-       elm_object_part_content_set(layout, "setup_guide_text", info_btn);
 
+       elm_object_part_text_set(layout, "inform", i18n_get_text("IDS_TGRAM_BODY_ENTER_YOUR_FIRST_AND_LAST_NAME_ABB"));
 
        Evas_Object* first_name_entry = elm_entry_add(layout);
        evas_object_size_hint_weight_set(first_name_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(first_name_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       elm_object_part_text_set(first_name_entry, "elm.guide", "<font=Tizen:style=Regular color=#666362 align=left><font_size=36>First name (required)</font_size></font>");
+       elm_object_part_text_set(first_name_entry, "elm.guide", i18n_get_text("IDS_TGRAM_BODY_FIRST_NAME_HREQUIRED_ABB"));
 
        elm_entry_single_line_set(first_name_entry, EINA_TRUE);
        elm_entry_scrollable_set (first_name_entry, EINA_FALSE);
@@ -113,12 +102,11 @@ void launch_first_registration_cb(appdata_s *ad)
 
        evas_object_smart_callback_add(first_name_entry, "changed", on_first_name_change_enable_ok_button, ad);
 
-
        Evas_Object* second_name_entry = elm_entry_add(layout);
        evas_object_size_hint_weight_set(second_name_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(second_name_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       elm_object_part_text_set(second_name_entry, "elm.guide", "<font=Tizen:style=Regular color=#666362 align=left><font_size=36>Last name (optional)</font_size></font>");
+       elm_object_part_text_set(second_name_entry, "elm.guide", i18n_get_text("IDS_TGRAM_BODY_LAST_NAME_HREQUIRED_ABB"));
 
        elm_entry_single_line_set(second_name_entry, EINA_TRUE);
        elm_entry_scrollable_set (second_name_entry, EINA_FALSE);
@@ -131,16 +119,18 @@ void launch_first_registration_cb(appdata_s *ad)
        evas_object_data_set(ad->nf, "second_name_entry", (void*)second_name_entry);
 
 
-       Elm_Object_Item* navi_item = elm_naviframe_item_push(ad->nf, "Your name", NULL, NULL, scroller, NULL);
+       Elm_Object_Item* navi_item = elm_naviframe_item_push(ad->nf, i18n_get_text("IDS_TGRAM_HEADER_ENTER_NAME_ABB2"), NULL, NULL, scroller, NULL);
 
        Evas_Object *done_btn = elm_button_add(ad->nf);
-       elm_object_style_set(done_btn, "naviframe/title_icon");
-       elm_object_text_set(done_btn, "Done");
+       elm_object_style_set(done_btn, "naviframe/title_right");
+       elm_object_text_set(done_btn, i18n_get_text("IDS_TGRAM_ACBUTTON_DONE_ABB"));
        evas_object_smart_callback_add(done_btn, "clicked", on_name_entry_done_clicked, ad);
 
-       Evas_Object *cancel_btn = elm_label_add(ad->nf);
-       elm_object_style_set(cancel_btn, "naviframe/title_icon");
-
+       Evas_Object *cancel_btn = elm_button_add(ad->nf);
+       elm_object_style_set(cancel_btn, "naviframe/title_left");
+       elm_object_text_set(cancel_btn, i18n_get_text("IDS_TGRAM_ACBUTTON_CANCEL_ABB"));
+       evas_object_smart_callback_add(cancel_btn, "clicked", on_naviframe_cancel_clicked, ad)
+       ;
        elm_object_item_part_content_set(navi_item, "title_right_btn", done_btn);
        elm_object_item_part_content_set(navi_item, "title_left_btn", cancel_btn);
 
index 41f3673..223ac90 100644 (file)
@@ -239,7 +239,7 @@ void launch_init_screen(appdata_s* ad)
        char edj_path[PATH_MAX] = {0, };
 
        layout = elm_layout_add(ad->win);
-       app_get_resource(TELEGRAM_INIT_VIEW_EDJ, edj_path, (int)PATH_MAX);
+       app_get_resource(TELEGRAM_START_VIEW_EDJ, edj_path, (int)PATH_MAX);
        elm_layout_file_set(layout, edj_path, "setup,layout");
        ad->current_app_state = TG_INIT_SCREEN_STATE;
        evas_object_data_set(layout, "page_idx", (void *) 0);
index e7a3309..b98c7ee 100644 (file)
@@ -8,9 +8,6 @@
 #include "server_requests.h"
 #include "tg_first_registration.h"
 
-#define TIMER_TEXT "We will call in "
-#define CODE_INFO_TEXT "We've sent an SMS with an activation code to your phone "
-
 static void on_code_change_enable_ok_button(void *data, Evas_Object *obj, void *event_info)
 {
        appdata_s* ad = data;
@@ -26,6 +23,13 @@ static void on_code_change_enable_ok_button(void *data, Evas_Object *obj, void *
 
 }
 
+static void on_naviframe_cancel_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+       appdata_s* ad = data;
+       elm_win_lower(ad->win);
+       elm_exit();
+}
+
 static void on_code_entry_done_clicked(void *data, Evas_Object *obj, void *event_info)
 {
        appdata_s* ad = data;
@@ -72,15 +76,13 @@ static Eina_Bool on_code_timer_cb(void* data)
        (ad->timer_value)--;
 
        int cur_time_in_secs = ad->timer_value;
-       Evas_Object* info_timer = evas_object_data_get(ad->nf, "info_timer");
        if (cur_time_in_secs <= 0) {
-               char temp_txt[512] = {0,};
-               snprintf(temp_txt, sizeof(temp_txt), "<font=Tizen:style=Regular color=#666362 align=left><font_size=32>%s</font_size></font>", "Requested for code via call.");
-
-               elm_object_text_set(info_timer, temp_txt);
                Ecore_Timer* timer = evas_object_data_get(ad->nf, "code_timer");
                ecore_timer_del(timer);
 
+               char temp_txt[512] = {0,};
+                       snprintf(temp_txt, sizeof(temp_txt), i18n_get_text("IDS_TGRAM_BODY_TELEGRAM_WILL_CALL_IN_P1SD_CP2SD"), 0, 0);
+
                // send request to get phone call
                send_request_for_registration(ad->service_client, ad->phone_number, EINA_FALSE);
                return ECORE_CALLBACK_CANCEL;
@@ -89,32 +91,11 @@ static Eina_Bool on_code_timer_cb(void* data)
        int seconds = cur_time_in_secs % 60;
        int minutes = (cur_time_in_secs / 60) % 60;
 
-       char sec_str[10];
-       char min_str[10];
-
-       if (minutes < 10) {
-               sprintf(min_str, "0%d", minutes);
-       } else {
-               sprintf(min_str, "%d", minutes);
-       }
-       if (seconds < 10) {
-               sprintf(sec_str, "0%d", seconds);
-       } else {
-               sprintf(sec_str, "%d", seconds);
-       }
-
-       char* timer_text = (char*)malloc(strlen(TIMER_TEXT) + strlen(min_str) + strlen(":") + strlen(sec_str) + 1);
-       strcpy(timer_text, TIMER_TEXT);
-       strcat(timer_text, min_str);
-       strcat(timer_text, ":");
-       strcat(timer_text, sec_str);
-
        char temp_txt[512] = {0,};
-       snprintf(temp_txt, sizeof(temp_txt), "<font=Tizen:style=Regular color=#666362 align=left><font_size=32>%s</font_size></font>", timer_text);
+       snprintf(temp_txt, sizeof(temp_txt), i18n_get_text("IDS_TGRAM_BODY_TELEGRAM_WILL_CALL_IN_P1SD_CP2SD"), minutes, seconds);
 
-       elm_object_text_set(info_timer, temp_txt);
-
-       free(timer_text);
+       Evas_Object *layout = evas_object_data_get(ad->nf, "layout");
+       elm_object_part_text_set(layout, "timer_text", temp_txt);
 
        if (ad->timer_value == 0 || (seconds == 0 && minutes == 0) ) {
 
@@ -159,31 +140,17 @@ void launch_login_cb(appdata_s* ad)
        char* info_txt = NULL;
 
        if (ad->phone_number) {
-               info_txt = (char*)malloc(strlen(CODE_INFO_TEXT) + strlen(ad->phone_number) + 1);
-               strcpy(info_txt, CODE_INFO_TEXT);
+               info_txt = (char*)malloc(strlen(ad->phone_number) + 1);
                strcat(info_txt, ad->phone_number);
-       } else {
-               info_txt = (char*)malloc(strlen(CODE_INFO_TEXT) + 1);
-               strcpy(info_txt, CODE_INFO_TEXT);
        }
 
-       char temp_txt[512] = {0,};
-       snprintf(temp_txt, sizeof(temp_txt), "<font=Tizen:style=Regular color=#666362 align=left><font_size=32>%s</font_size></font>", info_txt);
-       free(info_txt);
-
-       Evas_Object* info_btn = elm_entry_add(layout);
-       elm_object_text_set(info_btn, temp_txt);
-       evas_object_size_hint_weight_set(info_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(info_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_entry_single_line_set(info_btn,  EINA_FALSE);
-       elm_entry_editable_set(info_btn, EINA_FALSE);
-       elm_entry_line_wrap_set(info_btn, EINA_TRUE);
-       evas_object_show(info_btn);
-       elm_object_part_content_set(layout, "phone_status", info_btn);
-
+       // phone number
+       elm_object_part_text_set(layout, "phone_status", info_txt);
+       // inform textblock
+       elm_object_part_text_set(layout, "inform", i18n_get_text("IDS_TGRAM_BODY_A_VERIFICATION_CODE_HAS_BEEN_SENT_MSG"));
 
        Evas_Object* code_number_entry = elm_entry_add(layout);
-       elm_object_part_text_set(code_number_entry, "elm.guide", "<font=Tizen:style=Regular color=#666362 align=left><font_size=36>Code</font_size></font>");
+       elm_object_part_text_set(code_number_entry, "elm.guide", i18n_get_text("IDS_TGRAM_BODY_CODE"));
        elm_entry_cursor_end_set(code_number_entry);
        evas_object_size_hint_weight_set(code_number_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(code_number_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -212,43 +179,23 @@ void launch_login_cb(appdata_s* ad)
 
 
        char temp_timer_txt[512] = {0,};
-       snprintf(temp_timer_txt, sizeof(temp_timer_txt), "<font=Tizen:style=Regular color=#666362 align=left><font_size=32>%s2::00</font_size></font>", TIMER_TEXT);
+       snprintf(temp_timer_txt, sizeof(temp_timer_txt), i18n_get_text("IDS_TGRAM_BODY_TELEGRAM_WILL_CALL_IN_P1SD_CP2SD"), 2, 00);
+       elm_object_part_text_set(layout, "timer_text", temp_timer_txt);
 
+       evas_object_data_set(ad->nf, "layout", layout);
 
-       Evas_Object* info_timer = elm_entry_add(layout);
-       elm_object_text_set(info_timer, temp_timer_txt);
-       evas_object_size_hint_weight_set(info_timer, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(info_timer, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_entry_single_line_set(info_timer,  EINA_FALSE);
-       elm_entry_editable_set(info_timer, EINA_FALSE);
-       elm_entry_line_wrap_set(info_timer, EINA_TRUE);
-       evas_object_show(info_timer);
-       elm_object_part_content_set(layout, "timer_text", info_timer);
-
-       evas_object_data_set(ad->nf, "info_timer", (void*)info_timer);
-
-
-       Evas_Object* wrong_num_btn = elm_entry_add(layout);
-       elm_entry_editable_set(wrong_num_btn, EINA_FALSE);
-       elm_object_text_set(wrong_num_btn, "<font=Tizen:style=Regular color=#0000ff align=left><font_size=32>Wrong number?</font_size></font>");
-       evas_object_size_hint_weight_set(wrong_num_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(wrong_num_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_smart_callback_add(wrong_num_btn, "clicked", on_wrong_num_clicked, ad);
-       elm_object_part_content_set(layout, "wrong_num_btn", wrong_num_btn);
-
-
-       Elm_Object_Item* navi_item = elm_naviframe_item_push(ad->nf, "Your code", NULL, NULL, scroller, NULL);
+       Elm_Object_Item* navi_item = elm_naviframe_item_push(ad->nf, i18n_get_text("IDS_TGRAM_HEADER_ENTER_CODE_ABB"), NULL, NULL, scroller, NULL);
 
        Evas_Object *done_btn = elm_button_add(ad->nf);
-       elm_object_style_set(done_btn, "naviframe/title_icon");
-       elm_object_text_set(done_btn, "Done");
+       elm_object_style_set(done_btn, "naviframe/title_right");
+       elm_object_text_set(done_btn, i18n_get_text("IDS_TGRAM_ACBUTTON_DONE_ABB"));
        evas_object_smart_callback_add(done_btn, "clicked", on_code_entry_done_clicked, ad);
 
 
-       Evas_Object *cancel_btn = elm_label_add(ad->nf);
-       elm_object_style_set(cancel_btn, "naviframe/title_icon");
-
-
+       Evas_Object *cancel_btn = elm_button_add(ad->nf);
+       elm_object_style_set(cancel_btn, "naviframe/title_left");
+       elm_object_text_set(cancel_btn, i18n_get_text("IDS_TGRAM_ACBUTTON_CANCEL_ABB"));
+       evas_object_smart_callback_add(cancel_btn, "clicked", on_naviframe_cancel_clicked, ad);
 
        elm_object_item_part_content_set(navi_item, "title_right_btn", done_btn);
        elm_object_item_part_content_set(navi_item, "title_left_btn", cancel_btn);
index 3bea794..bdb3c79 100644 (file)
@@ -14,12 +14,20 @@ static void on_text_change_enable_ok_button(void *data, Evas_Object *obj, void *
        appdata_s* ad = data;
        Evas_Object* country_name_btn = evas_object_data_get(ad->nf, "country_name_btn");
        Evas_Object* done_btn = evas_object_data_get(ad->nf, "reg_done_btn");
+       Evas_Object *layout = NULL;
        char buf[256] = {'\0',};
        snprintf(buf, sizeof(buf), "%s", elm_object_text_get(obj));
 
        char code_buf[256] = {'\0',};
        snprintf(code_buf, sizeof(code_buf), "%s", elm_object_text_get(country_name_btn));
 
+       layout = evas_object_data_get(ad->nf, "regi,layout");
+       if (strcasecmp(buf, "") != 0) {
+               elm_object_signal_emit(layout, "show", "delete");
+       } else {
+               elm_object_signal_emit(layout, "hide", "delete");
+       }
+
        if (strlen(buf) == MAX_NUM_LENGTH && strcasecmp(code_buf, "Select your country") != 0) {
                elm_object_disabled_set(done_btn, EINA_FALSE);
        } else {
@@ -116,6 +124,12 @@ static void move_dropdown(Evas_Object *ctxpopup, Evas_Object *btn)
        evas_object_move(ctxpopup, x + (w / 2), y + h);
 }
 
+static void delete_btn_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+       Evas_Object *pn_number_entry = data;
+       elm_object_text_set(pn_number_entry, "");
+}
+
 static void on_country_name_list_clicked(void *data, Evas_Object *obj, void *event_info)
 {
        appdata_s *ad = data;
@@ -153,7 +167,7 @@ void launch_registration_cb(appdata_s *ad)
        ad->current_app_state = TG_REGISTRATION_STATE;
 
        char edj_path[PATH_MAX] = {0, };
-       app_get_resource(TELEGRAM_REGISTRATION_VIEW_EDJ, edj_path, (int)PATH_MAX);
+       app_get_resource(TELEGRAM_INIT_VIEW_EDJ, edj_path, (int)PATH_MAX);
 
        Evas_Object* scroller = elm_scroller_add(ad->nf);
        elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_TRUE);
@@ -165,6 +179,7 @@ void launch_registration_cb(appdata_s *ad)
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_show(layout);
        elm_object_content_set(scroller, layout);
+       evas_object_data_set(ad->nf, "regi,layout", layout);
 
        Evas_Object* country_name_btn = elm_button_add(layout);
        elm_object_text_set(country_name_btn, "Select your country");
@@ -176,7 +191,6 @@ void launch_registration_cb(appdata_s *ad)
 
        evas_object_data_set(ad->nf, "country_name_btn", (void*)country_name_btn);
 
-
        Evas_Object* country_code_btn = elm_entry_add(layout);
        elm_object_text_set(country_code_btn, "<align=center>--<align>");
        evas_object_size_hint_weight_set(country_code_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -188,9 +202,8 @@ void launch_registration_cb(appdata_s *ad)
 
        evas_object_data_set(ad->nf, "country_code_btn", (void*)country_code_btn);
 
-
        Evas_Object* pn_number_entry = elm_entry_add(layout);
-       elm_object_part_text_set(pn_number_entry, "elm.guide", "Enter phone number");
+       elm_object_part_text_set(pn_number_entry, "elm.guide", i18n_get_text("IDS_TGRAM_BODY_PHONE_NUMBER_ABB"));
        elm_entry_cursor_end_set(pn_number_entry);
        evas_object_size_hint_weight_set(pn_number_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(pn_number_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -204,7 +217,6 @@ void launch_registration_cb(appdata_s *ad)
 
        evas_object_data_set(ad->nf, "pn_number_entry", (void*)pn_number_entry);
 
-
        limit_filter_data.max_char_count = MAX_NUM_LENGTH;
 
        elm_entry_markup_filter_append(pn_number_entry, elm_entry_filter_limit_size, &limit_filter_data);
@@ -217,28 +229,29 @@ void launch_registration_cb(appdata_s *ad)
        //Enable OK button if no of chars has reached to 10 then
        evas_object_smart_callback_add(pn_number_entry, "changed", on_text_change_enable_ok_button, ad);
 
+       Evas_Object* delete_btn = elm_button_add(layout);
+       elm_object_style_set(delete_btn, "icon_expand_delete");
+       evas_object_size_hint_weight_set(delete_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(delete_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_max_set(delete_btn, 80, 80);
+       evas_object_smart_callback_add(delete_btn, "clicked", delete_btn_clicked, pn_number_entry);
+       elm_object_part_content_set(layout, "phone_number_delete", delete_btn);
+       evas_object_show(delete_btn);
 
-       Evas_Object* note_btn = elm_entry_add(layout);
-       elm_object_text_set(note_btn, "<align=left>Please confirm your country code and enter your phone number.<align>");
-       evas_object_size_hint_weight_set(note_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(note_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_entry_single_line_set(note_btn,  EINA_FALSE);
-       elm_entry_editable_set(note_btn, EINA_FALSE);
-       elm_entry_line_wrap_set(note_btn, EINA_TRUE);
-       evas_object_show(note_btn);
-       elm_object_part_content_set(layout, "text_display", note_btn);
-
+       //confirm text
+       elm_object_part_text_set(layout, "text_display", i18n_get_text("IDS_TGRAM_BODY_CONFIRM_YOUR_COUNTRY_CODE_MSG"));
 
-       Elm_Object_Item* navi_item = elm_naviframe_item_push(ad->nf, "Your phone", NULL, NULL, scroller, NULL);
+       //naviframe GUI
+       Elm_Object_Item* navi_item = elm_naviframe_item_push(ad->nf, i18n_get_text("IDS_TGRAM_HEADER_ENTER_NUMBER_ABB"), NULL, NULL, scroller, NULL);
 
        Evas_Object *cancel_btn = elm_button_add(ad->nf);
-       elm_object_style_set(cancel_btn, "naviframe/title_icon");
-       elm_object_text_set(cancel_btn, "Cancel");
+       elm_object_style_set(cancel_btn, "naviframe/title_left");
+       elm_object_text_set(cancel_btn, i18n_get_text("IDS_TGRAM_ACBUTTON_CANCEL_ABB"));
        evas_object_smart_callback_add(cancel_btn, "clicked", on_naviframe_cancel_clicked, ad);
 
        Evas_Object *done_btn = elm_button_add(ad->nf);
-       elm_object_style_set(done_btn, "naviframe/title_icon");
-       elm_object_text_set(done_btn, "Done");
+       elm_object_style_set(done_btn, "naviframe/title_right");
+       elm_object_text_set(done_btn, i18n_get_text("IDS_TGRAM_ACBUTTON_DONE_ABB"));
        evas_object_smart_callback_add(done_btn, "clicked", on_naviframe_done_clicked, ad);
 
 
index 602e651..af0f5d1 100644 (file)
@@ -33,8 +33,8 @@
 
 #define TELEGRAM_CUSTOM_WINSET_EDJ     "edje/telegram_theme.edj"
 #define TELEGRAM_CHAT_VIEW_EDJ "edje/telegram_chat_view.edj"
-#define TELEGRAM_INIT_VIEW_EDJ "edje/telegram_start_screen.edj"
-#define TELEGRAM_REGISTRATION_VIEW_EDJ "edje/telegram_init_screen.edj"
+#define TELEGRAM_START_VIEW_EDJ        "edje/telegram_start_screen.edj"
+#define TELEGRAM_INIT_VIEW_EDJ "edje/telegram_init_screen.edj"
 #define TELEGRAM_POPUP_VIEW_EDJ        "edje/telegram_custom_popup.edj"
 #define TELEGRAM_GENLIST_THEME_EDJ     "edje/telegram_genlist_theme.edj"