diff --git "a/labels/test_ui_data.csv" "b/labels/test_ui_data.csv"
--- "a/labels/test_ui_data.csv"
+++ "b/labels/test_ui_data.csv"
@@ -62,7 +62,7 @@ wf_287.jpg,750,1334,image,450.0,202.0,232.0,234.0,Wireframes_wf_287.xml
 wf_287.jpg,750,1334,image,82.0,203.0,231.0,233.0,Wireframes_wf_287.xml
 wf_287.jpg,750,1334,text,94.0,95.0,107.0,26.0,Wireframes_wf_287.xml
 wf_287.jpg,750,1334,icon,47.0,93.0,32.0,30.0,Wireframes_wf_287.xml
-wf_287.jpg,750,1334,edittext,30.0,72.0,694.0,74.0,Wireframes_wf_287.xml
+wf_287.jpg,750,1334,inputfield,30.0,72.0,694.0,74.0,Wireframes_wf_287.xml
 wf_28.jpg,1080,2168,uppertaskbar,2.0,1.0,1078.0,75.0,Wireframes_wf_28.xml
 wf_28.jpg,1080,2168,text,217.0,141.0,233.0,59.0,Wireframes_wf_28.xml
 wf_28.jpg,1080,2168,text,435.0,302.0,210.0,34.0,Wireframes_wf_28.xml
@@ -124,7 +124,7 @@ wf_118.jpg,750,1335,icon,54.0,575.0,40.0,38.0,Wireframes_wf_118.xml
 wf_118.jpg,750,1335,icon,57.0,696.0,35.0,41.0,Wireframes_wf_118.xml
 wf_118.jpg,750,1335,icon,55.0,814.0,40.0,42.0,Wireframes_wf_118.xml
 wf_118.jpg,750,1335,icon,54.0,938.0,42.0,33.0,Wireframes_wf_118.xml
-wf_118.jpg,750,1335,drawer,1.0,1.0,631.0,1334.0,Wireframes_wf_118.xml
+wf_118.jpg,750,1335,slidingmenu,1.0,1.0,631.0,1334.0,Wireframes_wf_118.xml
 wf_290.jpg,750,1334,text,36.0,574.0,274.0,59.0,Wireframes_wf_290.xml
 wf_290.jpg,750,1334,text,37.0,526.0,187.0,31.0,Wireframes_wf_290.xml
 wf_290.jpg,750,1334,text,408.0,527.0,188.0,30.0,Wireframes_wf_290.xml
@@ -139,7 +139,7 @@ wf_290.jpg,750,1334,image,398.0,241.0,283.0,141.0,Wireframes_wf_290.xml
 wf_290.jpg,750,1334,image,29.0,240.0,282.0,143.0,Wireframes_wf_290.xml
 wf_290.jpg,750,1334,text,94.0,95.0,107.0,26.0,Wireframes_wf_290.xml
 wf_290.jpg,750,1334,icon,47.0,93.0,32.0,30.0,Wireframes_wf_290.xml
-wf_290.jpg,750,1334,edittext,30.0,72.0,694.0,74.0,Wireframes_wf_290.xml
+wf_290.jpg,750,1334,inputfield,30.0,72.0,694.0,74.0,Wireframes_wf_290.xml
 wf_208.jpg,375,812,text,64.0,106.0,247.0,76.0,Wireframes_wf_208.xml
 wf_208.jpg,375,812,text,80.0,208.0,221.0,39.0,Wireframes_wf_208.xml
 wf_208.jpg,375,812,text,153.0,322.0,173.0,60.0,Wireframes_wf_208.xml
@@ -154,7 +154,7 @@ wf_143.jpg,750,1334,text,157.0,411.0,80.0,28.0,Wireframes_wf_143.xml
 wf_143.jpg,750,1334,text,218.0,66.0,314.0,36.0,Wireframes_wf_143.xml
 wf_143.jpg,750,1334,text,95.0,197.0,556.0,87.0,Wireframes_wf_143.xml
 wf_143.jpg,750,1334,icon,47.0,74.0,15.0,24.0,Wireframes_wf_143.xml
-wf_143.jpg,750,1334,edittext,56.0,366.0,639.0,120.0,Wireframes_wf_143.xml
+wf_143.jpg,750,1334,inputfield,56.0,366.0,639.0,120.0,Wireframes_wf_143.xml
 wf_143.jpg,750,1334,textbutton,56.0,516.0,639.0,120.0,Wireframes_wf_143.xml
 wf_235.jpg,375,812,text,76.0,66.0,224.0,70.0,Wireframes_wf_235.xml
 wf_235.jpg,375,812,text,84.0,290.0,56.0,38.0,Wireframes_wf_235.xml
@@ -185,10 +185,10 @@ wf_140.jpg,750,1334,icon,93.0,671.0,33.0,43.0,Wireframes_wf_140.xml
 wf_140.jpg,750,1334,text,311.0,65.0,127.0,37.0,Wireframes_wf_140.xml
 wf_140.jpg,750,1334,icon,46.0,74.0,16.0,24.0,Wireframes_wf_140.xml
 wf_140.jpg,750,1334,textbutton,56.0,783.0,640.0,121.0,Wireframes_wf_140.xml
-wf_140.jpg,750,1334,edittext,56.0,184.0,640.0,120.0,Wireframes_wf_140.xml
-wf_140.jpg,750,1334,edittext,56.0,334.0,640.0,120.0,Wireframes_wf_140.xml
-wf_140.jpg,750,1334,edittext,55.0,483.0,641.0,121.0,Wireframes_wf_140.xml
-wf_140.jpg,750,1334,edittext,55.0,633.0,641.0,121.0,Wireframes_wf_140.xml
+wf_140.jpg,750,1334,inputfield,56.0,184.0,640.0,120.0,Wireframes_wf_140.xml
+wf_140.jpg,750,1334,inputfield,56.0,334.0,640.0,120.0,Wireframes_wf_140.xml
+wf_140.jpg,750,1334,inputfield,55.0,483.0,641.0,121.0,Wireframes_wf_140.xml
+wf_140.jpg,750,1334,inputfield,55.0,633.0,641.0,121.0,Wireframes_wf_140.xml
 wf_140.jpg,750,1334,text,293.0,1137.0,165.0,34.0,Wireframes_wf_140.xml
 wf_140.jpg,750,1334,textbutton,1.0,1214.0,749.0,120.0,Wireframes_wf_140.xml
 wf_236.jpg,375,812,text,76.0,66.0,224.0,70.0,Wireframes_wf_236.xml
@@ -253,8 +253,8 @@ wf_48.jpg,375,997,image,278.0,445.0,85.0,79.0,Wireframes_wf_48.xml
 wf_48.jpg,375,997,icon,30.0,745.0,44.0,45.0,Wireframes_wf_48.xml
 wf_145.jpg,375,667,text,86.0,351.0,71.0,15.0,Wireframes_wf_145.xml
 wf_145.jpg,375,667,text,87.0,296.0,39.0,16.0,Wireframes_wf_145.xml
-wf_145.jpg,375,667,edittext,56.0,346.0,267.0,41.0,Wireframes_wf_145.xml
-wf_145.jpg,375,667,edittext,55.0,296.0,268.0,38.0,Wireframes_wf_145.xml
+wf_145.jpg,375,667,inputfield,56.0,346.0,267.0,41.0,Wireframes_wf_145.xml
+wf_145.jpg,375,667,inputfield,55.0,296.0,268.0,38.0,Wireframes_wf_145.xml
 wf_145.jpg,375,667,icon,60.0,347.0,15.0,23.0,Wireframes_wf_145.xml
 wf_145.jpg,375,667,icon,55.0,298.0,20.0,15.0,Wireframes_wf_145.xml
 wf_145.jpg,375,667,icon,19.0,32.0,15.0,19.0,Wireframes_wf_145.xml
@@ -280,17 +280,11 @@ wf_179.jpg,1080,2460,text,72.0,1854.0,218.0,53.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,text,71.0,1915.0,225.0,42.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,text,73.0,2290.0,217.0,57.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,text,72.0,2353.0,223.0,43.0,Wireframes_wf_179.xml
-wf_179.jpg,1080,2460,toolbar,1.0,75.0,1079.0,166.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,image,49.0,300.0,982.0,352.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,image,51.0,740.0,980.0,352.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,image,50.0,1177.0,981.0,354.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,image,51.0,1615.0,980.0,353.0,Wireframes_wf_179.xml
 wf_179.jpg,1080,2460,image,49.0,2055.0,982.0,352.0,Wireframes_wf_179.xml
-wf_179.jpg,1080,2460,card,22.0,2024.0,1038.0,414.0,Wireframes_wf_179.xml
-wf_179.jpg,1080,2460,card,23.0,1585.0,1036.0,413.0,Wireframes_wf_179.xml
-wf_179.jpg,1080,2460,card,22.0,1147.0,1037.0,413.0,Wireframes_wf_179.xml
-wf_179.jpg,1080,2460,card,22.0,709.0,1037.0,412.0,Wireframes_wf_179.xml
-wf_179.jpg,1080,2460,card,22.0,269.0,1037.0,413.0,Wireframes_wf_179.xml
 wf_186.jpg,1080,2650,uppertaskbar,1.0,1.0,1079.0,75.0,Wireframes_wf_186.xml
 wf_186.jpg,1080,2650,text,217.0,142.0,234.0,58.0,Wireframes_wf_186.xml
 wf_186.jpg,1080,2650,text,796.0,303.0,209.0,32.0,Wireframes_wf_186.xml
@@ -334,15 +328,6 @@ wf_186.jpg,1080,2650,image,745.0,1663.0,294.0,293.0,Wireframes_wf_186.xml
 wf_186.jpg,1080,2650,image,42.0,2166.0,293.0,292.0,Wireframes_wf_186.xml
 wf_186.jpg,1080,2650,image,394.0,2166.0,293.0,292.0,Wireframes_wf_186.xml
 wf_186.jpg,1080,2650,image,746.0,2166.0,293.0,293.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,23.0,519.0,1037.0,967.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,376.0,2147.0,331.0,477.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,726.0,2145.0,332.0,476.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,726.0,1643.0,332.0,476.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,375.0,1643.0,331.0,476.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,23.0,1643.0,331.0,476.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,card,24.0,2147.0,330.0,475.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,toolbar,1.0,76.0,1079.0,165.0,Wireframes_wf_186.xml
-wf_186.jpg,1080,2650,multi_tab,1.0,241.0,1079.0,144.0,Wireframes_wf_186.xml
 wf_77.jpg,750,1334,icon,47.0,74.0,17.0,24.0,Wireframes_wf_77.xml
 wf_77.jpg,750,1334,icon,698.0,176.0,15.0,25.0,Wireframes_wf_77.xml
 wf_77.jpg,750,1334,icon,697.0,296.0,17.0,23.0,Wireframes_wf_77.xml
@@ -373,7 +358,7 @@ wf_191.jpg,750,1334,icon,36.0,73.0,37.0,25.0,Wireframes_wf_191.xml
 wf_191.jpg,750,1334,icon,681.0,70.0,30.0,31.0,Wireframes_wf_191.xml
 wf_191.jpg,750,1334,textbutton,375.0,49.0,201.0,62.0,Wireframes_wf_191.xml
 wf_191.jpg,750,1334,textbutton,175.0,50.0,206.0,62.0,Wireframes_wf_191.xml
-wf_191.jpg,750,1334,edittext,9.0,140.0,733.0,102.0,Wireframes_wf_191.xml
+wf_191.jpg,750,1334,inputfield,9.0,140.0,733.0,102.0,Wireframes_wf_191.xml
 wf_191.jpg,750,1334,text,75.0,290.0,23.0,28.0,Wireframes_wf_191.xml
 wf_191.jpg,750,1334,text,162.0,380.0,160.0,25.0,Wireframes_wf_191.xml
 wf_191.jpg,750,1334,text,160.0,428.0,183.0,22.0,Wireframes_wf_191.xml
@@ -407,7 +392,7 @@ wf_191.jpg,750,1334,text,73.0,787.0,24.0,29.0,Wireframes_wf_191.xml
 wf_76.jpg,750,1334,text,351.0,181.0,101.0,26.0,Wireframes_wf_76.xml
 wf_76.jpg,750,1334,icon,297.0,171.0,36.0,38.0,Wireframes_wf_76.xml
 wf_76.jpg,750,1334,uppertaskbar,2.0,1.0,748.0,31.0,Wireframes_wf_76.xml
-wf_76.jpg,750,1334,edittext,10.0,140.0,731.0,102.0,Wireframes_wf_76.xml
+wf_76.jpg,750,1334,inputfield,10.0,140.0,731.0,102.0,Wireframes_wf_76.xml
 wf_76.jpg,750,1334,icon,680.0,71.0,31.0,30.0,Wireframes_wf_76.xml
 wf_76.jpg,750,1334,icon,36.0,74.0,38.0,24.0,Wireframes_wf_76.xml
 wf_76.jpg,750,1334,textbutton,175.0,50.0,208.0,61.0,Wireframes_wf_76.xml
@@ -471,7 +456,6 @@ wf_148.jpg,375,667,icon,16.0,413.0,40.0,39.0,Wireframes_wf_148.xml
 wf_148.jpg,375,667,image,1.0,269.0,374.0,197.0,Wireframes_wf_148.xml
 wf_148.jpg,375,667,image,1.0,468.0,374.0,198.0,Wireframes_wf_148.xml
 wf_148.jpg,375,667,icon,17.0,613.0,38.0,38.0,Wireframes_wf_148.xml
-wf_148.jpg,375,667,toolbar,1.0,1.0,374.0,67.0,Wireframes_wf_148.xml
 wf_87.jpg,375,812,uppertaskbar,33.0,16.0,329.0,14.0,Wireframes_wf_87.xml
 wf_87.jpg,375,812,text,115.0,47.0,40.0,14.0,Wireframes_wf_87.xml
 wf_87.jpg,375,812,text,138.0,68.0,51.0,12.0,Wireframes_wf_87.xml
@@ -546,19 +530,17 @@ wf_45.jpg,1080,2300,image,546.0,1613.0,523.0,523.0,Wireframes_wf_45.xml
 wf_96.jpg,356,725,text,114.0,115.0,110.0,13.0,Wireframes_wf_96.xml
 wf_96.jpg,356,725,icon,36.0,115.0,11.0,18.0,Wireframes_wf_96.xml
 wf_96.jpg,356,725,image,98.0,161.0,162.0,133.0,Wireframes_wf_96.xml
-wf_96.jpg,356,725,edittext,97.0,348.0,178.0,19.0,Wireframes_wf_96.xml
-wf_96.jpg,356,725,edittext,97.0,389.0,178.0,22.0,Wireframes_wf_96.xml
-wf_96.jpg,356,725,edittext,97.0,430.0,178.0,21.0,Wireframes_wf_96.xml
-wf_96.jpg,356,725,edittext,97.0,465.0,179.0,23.0,Wireframes_wf_96.xml
+wf_96.jpg,356,725,inputfield,97.0,348.0,178.0,19.0,Wireframes_wf_96.xml
+wf_96.jpg,356,725,inputfield,97.0,389.0,178.0,22.0,Wireframes_wf_96.xml
+wf_96.jpg,356,725,inputfield,97.0,430.0,178.0,21.0,Wireframes_wf_96.xml
+wf_96.jpg,356,725,inputfield,97.0,465.0,179.0,23.0,Wireframes_wf_96.xml
 wf_96.jpg,356,725,textbutton,152.0,510.0,69.0,27.0,Wireframes_wf_96.xml
-wf_96.jpg,356,725,toolbar,24.0,103.0,310.0,38.0,Wireframes_wf_96.xml
 wf_164.jpg,750,1334,icon,40.0,71.0,30.0,30.0,Wireframes_wf_164.xml
 wf_164.jpg,750,1334,image,127.0,228.0,500.0,502.0,Wireframes_wf_164.xml
 wf_164.jpg,750,1334,text,52.0,901.0,272.0,45.0,Wireframes_wf_164.xml
 wf_164.jpg,750,1334,text,53.0,988.0,177.0,56.0,Wireframes_wf_164.xml
 wf_164.jpg,750,1334,text,49.0,1087.0,615.0,206.0,Wireframes_wf_164.xml
 wf_40.jpg,375,812,uppertaskbar,33.0,17.0,329.0,14.0,Wireframes_wf_40.xml
-wf_40.jpg,375,812,toolbar,1.0,42.0,374.0,42.0,Wireframes_wf_40.xml
 wf_40.jpg,375,812,text,146.0,55.0,40.0,18.0,Wireframes_wf_40.xml
 wf_40.jpg,375,812,text,35.0,56.0,34.0,17.0,Wireframes_wf_40.xml
 wf_40.jpg,375,812,text,88.0,281.0,198.0,30.0,Wireframes_wf_40.xml
@@ -584,8 +566,8 @@ wf_205.jpg,375,812,image,35.0,328.0,104.0,52.0,Wireframes_wf_205.xml
 wf_205.jpg,375,812,image,35.0,450.0,105.0,52.0,Wireframes_wf_205.xml
 wf_205.jpg,375,812,image,36.0,571.0,104.0,52.0,Wireframes_wf_205.xml
 wf_24.jpg,400,800,image,110.0,164.0,193.0,152.0,Wireframes_wf_24.xml
-wf_24.jpg,400,800,edittext,88.0,413.0,227.0,33.0,Wireframes_wf_24.xml
-wf_24.jpg,400,800,edittext,89.0,466.0,226.0,34.0,Wireframes_wf_24.xml
+wf_24.jpg,400,800,inputfield,88.0,413.0,227.0,33.0,Wireframes_wf_24.xml
+wf_24.jpg,400,800,inputfield,89.0,466.0,226.0,34.0,Wireframes_wf_24.xml
 wf_24.jpg,400,800,textbutton,191.0,509.0,121.0,17.0,Wireframes_wf_24.xml
 wf_24.jpg,400,800,textbutton,134.0,613.0,117.0,33.0,Wireframes_wf_24.xml
 wf_24.jpg,400,800,textbutton,88.0,659.0,222.0,14.0,Wireframes_wf_24.xml
@@ -604,9 +586,6 @@ wf_128.jpg,750,1334,text,226.0,768.0,132.0,41.0,Wireframes_wf_128.xml
 wf_128.jpg,750,1334,text,398.0,938.0,199.0,34.0,Wireframes_wf_128.xml
 wf_128.jpg,750,1334,text,396.0,1026.0,274.0,60.0,Wireframes_wf_128.xml
 wf_128.jpg,750,1334,text,397.0,1140.0,139.0,42.0,Wireframes_wf_128.xml
-wf_128.jpg,750,1334,card,9.0,505.0,732.0,364.0,Wireframes_wf_128.xml
-wf_128.jpg,750,1334,card,9.0,875.0,733.0,363.0,Wireframes_wf_128.xml
-wf_128.jpg,750,1334,card,10.0,137.0,731.0,362.0,Wireframes_wf_128.xml
 wf_101.jpg,750,1334,text,318.0,65.0,114.0,37.0,Wireframes_wf_101.xml
 wf_101.jpg,750,1334,icon,678.0,68.0,36.0,36.0,Wireframes_wf_101.xml
 wf_101.jpg,750,1334,icon,36.0,72.0,38.0,26.0,Wireframes_wf_101.xml
@@ -621,17 +600,14 @@ wf_101.jpg,750,1334,text,406.0,1144.0,156.0,27.0,Wireframes_wf_101.xml
 wf_101.jpg,750,1334,text,36.0,1192.0,218.0,30.0,Wireframes_wf_101.xml
 wf_101.jpg,750,1334,text,406.0,1193.0,218.0,28.0,Wireframes_wf_101.xml
 wf_101.jpg,750,1334,icon,697.0,176.0,17.0,25.0,Wireframes_wf_101.xml
-wf_101.jpg,750,1334,card,9.0,755.0,364.0,494.0,Wireframes_wf_101.xml
-wf_101.jpg,750,1334,card,378.0,756.0,364.0,493.0,Wireframes_wf_101.xml
-wf_101.jpg,750,1334,card,8.0,256.0,735.0,494.0,Wireframes_wf_101.xml
 wf_32.jpg,400,800,text,113.0,114.0,171.0,34.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,211.0,225.0,33.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,266.0,225.0,33.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,321.0,225.0,33.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,377.0,185.0,33.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,432.0,224.0,33.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,485.0,225.0,33.0,Wireframes_wf_32.xml
-wf_32.jpg,400,800,edittext,89.0,538.0,225.0,32.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,211.0,225.0,33.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,266.0,225.0,33.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,321.0,225.0,33.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,377.0,185.0,33.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,432.0,224.0,33.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,485.0,225.0,33.0,Wireframes_wf_32.xml
+wf_32.jpg,400,800,inputfield,89.0,538.0,225.0,32.0,Wireframes_wf_32.xml
 wf_32.jpg,400,800,icon,279.0,378.0,32.0,32.0,Wireframes_wf_32.xml
 wf_32.jpg,400,800,textbutton,136.0,614.0,115.0,32.0,Wireframes_wf_32.xml
 wf_32.jpg,400,800,textbutton,80.0,660.0,237.0,16.0,Wireframes_wf_32.xml
@@ -652,7 +628,6 @@ wf_107.jpg,375,667,icon,338.0,192.0,13.0,21.0,Wireframes_wf_107.xml
 wf_107.jpg,375,667,icon,338.0,411.0,13.0,21.0,Wireframes_wf_107.xml
 wf_107.jpg,375,667,icon,338.0,462.0,13.0,21.0,Wireframes_wf_107.xml
 wf_107.jpg,375,667,icon,333.0,514.0,21.0,22.0,Wireframes_wf_107.xml
-wf_107.jpg,375,667,toolbar,1.0,1.0,374.0,70.0,Wireframes_wf_107.xml
 wf_271.jpg,1080,1794,textbutton,187.0,1603.0,340.0,112.0,Wireframes_wf_271.xml
 wf_271.jpg,1080,1794,textbutton,552.0,1604.0,343.0,112.0,Wireframes_wf_271.xml
 wf_271.jpg,1080,1794,pageindicator,480.0,1348.0,105.0,29.0,Wireframes_wf_271.xml
@@ -679,7 +654,7 @@ wf_105.jpg,1080,1920,text,215.0,949.0,202.0,35.0,Wireframes_wf_105.xml
 wf_105.jpg,1080,1920,text,48.0,1108.0,205.0,40.0,Wireframes_wf_105.xml
 wf_105.jpg,1080,1920,text,213.0,1245.0,205.0,38.0,Wireframes_wf_105.xml
 wf_105.jpg,1080,1920,text,217.0,1375.0,199.0,38.0,Wireframes_wf_105.xml
-wf_105.jpg,1080,1920,drawer,1.0,75.0,912.0,1845.0,Wireframes_wf_105.xml
+wf_105.jpg,1080,1920,slidingmenu,1.0,75.0,912.0,1845.0,Wireframes_wf_105.xml
 wf_272.jpg,1080,1794,textbutton,187.0,1603.0,340.0,112.0,Wireframes_wf_272.xml
 wf_272.jpg,1080,1794,textbutton,552.0,1604.0,343.0,112.0,Wireframes_wf_272.xml
 wf_272.jpg,1080,1794,pageindicator,480.0,1348.0,105.0,29.0,Wireframes_wf_272.xml
@@ -694,8 +669,8 @@ uplabs_370.jpg,636,1343,text,72.0,304.0,92.0,20.0,uplabs_uplabs_370.xml
 uplabs_370.jpg,636,1343,icon,532.0,410.0,34.0,29.0,uplabs_uplabs_370.xml
 uplabs_370.jpg,636,1343,uppertaskbar,1.0,1.0,635.0,52.0,uplabs_uplabs_370.xml
 uplabs_370.jpg,636,1343,text,210.0,185.0,218.0,34.0,uplabs_uplabs_370.xml
-uplabs_370.jpg,636,1343,edittext,51.0,277.0,534.0,74.0,uplabs_uplabs_370.xml
-uplabs_370.jpg,636,1343,edittext,51.0,385.0,534.0,74.0,uplabs_uplabs_370.xml
+uplabs_370.jpg,636,1343,inputfield,51.0,277.0,534.0,74.0,uplabs_uplabs_370.xml
+uplabs_370.jpg,636,1343,inputfield,51.0,385.0,534.0,74.0,uplabs_uplabs_370.xml
 uplabs_370.jpg,636,1343,textbutton,215.0,509.0,207.0,76.0,uplabs_uplabs_370.xml
 uplabs_370.jpg,636,1343,text,158.0,615.0,321.0,23.0,uplabs_uplabs_370.xml
 uplabs_370.jpg,636,1343,image,56.0,874.0,537.0,393.0,uplabs_uplabs_370.xml
@@ -731,8 +706,8 @@ uplabs_825.jpg,1125,2436,text,774.0,1311.0,245.0,103.0,uplabs_uplabs_825.xml
 uplabs_825.jpg,1125,2436,text,216.0,2286.0,704.0,47.0,uplabs_uplabs_825.xml
 uplabs_825.jpg,1125,2436,textbutton,105.0,1542.0,916.0,151.0,uplabs_uplabs_825.xml
 uplabs_825.jpg,1125,2436,textbutton,105.0,1752.0,915.0,151.0,uplabs_uplabs_825.xml
-uplabs_825.jpg,1125,2436,edittext,108.0,848.0,913.0,96.0,uplabs_uplabs_825.xml
-uplabs_825.jpg,1125,2436,edittext,108.0,1072.0,913.0,96.0,uplabs_uplabs_825.xml
+uplabs_825.jpg,1125,2436,inputfield,108.0,848.0,913.0,96.0,uplabs_uplabs_825.xml
+uplabs_825.jpg,1125,2436,inputfield,108.0,1072.0,913.0,96.0,uplabs_uplabs_825.xml
 uplabs_825.jpg,1125,2436,backgroundimage,1.0,1.0,1124.0,2435.0,uplabs_uplabs_825.xml
 uplabs_575.jpg,375,812,text,91.0,553.0,61.0,11.0,uplabs_uplabs_575.xml
 uplabs_575.jpg,375,812,text,90.0,490.0,34.0,12.0,uplabs_uplabs_575.xml
@@ -744,9 +719,9 @@ uplabs_575.jpg,375,812,text,159.0,57.0,58.0,18.0,uplabs_uplabs_575.xml
 uplabs_575.jpg,375,812,icon,31.0,59.0,21.0,21.0,uplabs_uplabs_575.xml
 uplabs_575.jpg,375,812,image,118.0,131.0,119.0,168.0,uplabs_uplabs_575.xml
 uplabs_575.jpg,375,812,text,54.0,327.0,268.0,56.0,uplabs_uplabs_575.xml
-uplabs_575.jpg,375,812,edittext,37.0,414.0,303.0,48.0,uplabs_uplabs_575.xml
-uplabs_575.jpg,375,812,edittext,37.0,474.0,303.0,48.0,uplabs_uplabs_575.xml
-uplabs_575.jpg,375,812,edittext,37.0,534.0,303.0,48.0,uplabs_uplabs_575.xml
+uplabs_575.jpg,375,812,inputfield,37.0,414.0,303.0,48.0,uplabs_uplabs_575.xml
+uplabs_575.jpg,375,812,inputfield,37.0,474.0,303.0,48.0,uplabs_uplabs_575.xml
+uplabs_575.jpg,375,812,inputfield,37.0,534.0,303.0,48.0,uplabs_uplabs_575.xml
 uplabs_575.jpg,375,812,textbutton,37.0,616.0,302.0,46.0,uplabs_uplabs_575.xml
 uplabs_575.jpg,375,812,text,87.0,680.0,201.0,15.0,uplabs_uplabs_575.xml
 uplabs_165.jpg,375,812,uppertaskbar,35.0,17.0,326.0,14.0,uplabs_uplabs_165.xml
@@ -771,7 +746,6 @@ uplabs_373.jpg,375,667,icon,31.0,19.0,17.0,12.0,uplabs_uplabs_373.xml
 uplabs_373.jpg,375,667,text,335.0,19.0,24.0,9.0,uplabs_uplabs_373.xml
 uplabs_373.jpg,375,667,pageindicator,31.0,630.0,55.0,7.0,uplabs_uplabs_373.xml
 uplabs_373.jpg,375,667,icon,329.0,627.0,17.0,12.0,uplabs_uplabs_373.xml
-uplabs_373.jpg,375,667,card,30.0,58.0,317.0,511.0,uplabs_uplabs_373.xml
 uplabs_405.jpg,750,1303,text,136.0,936.0,478.0,46.0,uplabs_uplabs_405.xml
 uplabs_405.jpg,750,1303,text,91.0,1013.0,568.0,25.0,uplabs_uplabs_405.xml
 uplabs_405.jpg,750,1303,pageindicator,341.0,1214.0,69.0,20.0,uplabs_uplabs_405.xml
@@ -795,8 +769,8 @@ uplabs_809.jpg,1125,2436,text,153.0,150.0,147.0,48.0,uplabs_uplabs_809.xml
 uplabs_809.jpg,1125,2436,text,397.0,365.0,341.0,43.0,uplabs_uplabs_809.xml
 uplabs_809.jpg,1125,2436,image,42.0,138.0,74.0,74.0,uplabs_uplabs_809.xml
 uplabs_809.jpg,1125,2436,icon,815.0,1028.0,197.0,194.0,uplabs_uplabs_809.xml
-uplabs_809.jpg,1125,2436,edittext,105.0,531.0,923.0,151.0,uplabs_uplabs_809.xml
-uplabs_809.jpg,1125,2436,edittext,105.0,759.0,923.0,151.0,uplabs_uplabs_809.xml
+uplabs_809.jpg,1125,2436,inputfield,105.0,531.0,923.0,151.0,uplabs_uplabs_809.xml
+uplabs_809.jpg,1125,2436,inputfield,105.0,759.0,923.0,151.0,uplabs_uplabs_809.xml
 uplabs_410.jpg,375,812,uppertaskbar,35.0,17.0,326.0,14.0,uplabs_uplabs_410.xml
 uplabs_410.jpg,375,812,text,30.0,81.0,161.0,18.0,uplabs_uplabs_410.xml
 uplabs_410.jpg,375,812,text,29.0,122.0,312.0,56.0,uplabs_uplabs_410.xml
@@ -836,7 +810,7 @@ uplabs_604.jpg,750,1328,text,231.0,64.0,81.0,19.0,uplabs_uplabs_604.xml
 uplabs_604.jpg,750,1328,text,410.0,66.0,97.0,26.0,uplabs_uplabs_604.xml
 uplabs_604.jpg,750,1328,text,583.0,65.0,96.0,27.0,uplabs_uplabs_604.xml
 uplabs_604.jpg,750,1328,image,33.0,280.0,689.0,540.0,uplabs_uplabs_604.xml
-uplabs_604.jpg,750,1328,edittext,85.0,957.0,577.0,63.0,uplabs_uplabs_604.xml
+uplabs_604.jpg,750,1328,inputfield,85.0,957.0,577.0,63.0,uplabs_uplabs_604.xml
 uplabs_604.jpg,750,1328,textbutton,60.0,1097.0,628.0,82.0,uplabs_uplabs_604.xml
 uplabs_163.jpg,375,812,text,60.0,110.0,258.0,19.0,uplabs_uplabs_163.xml
 uplabs_163.jpg,375,812,text,312.0,51.0,39.0,21.0,uplabs_uplabs_163.xml
@@ -861,8 +835,8 @@ uplabs_273.jpg,375,812,image,1.0,574.0,374.0,238.0,uplabs_uplabs_273.xml
 uplabs_273.jpg,375,812,text,119.0,63.0,156.0,22.0,uplabs_uplabs_273.xml
 uplabs_273.jpg,375,812,text,89.0,109.0,198.0,17.0,uplabs_uplabs_273.xml
 uplabs_273.jpg,375,812,text,158.0,155.0,70.0,19.0,uplabs_uplabs_273.xml
-uplabs_273.jpg,375,812,edittext,47.0,234.0,281.0,50.0,uplabs_uplabs_273.xml
-uplabs_273.jpg,375,812,edittext,47.0,314.0,281.0,50.0,uplabs_uplabs_273.xml
+uplabs_273.jpg,375,812,inputfield,47.0,234.0,281.0,50.0,uplabs_uplabs_273.xml
+uplabs_273.jpg,375,812,inputfield,47.0,314.0,281.0,50.0,uplabs_uplabs_273.xml
 uplabs_273.jpg,375,812,textbutton,115.0,419.0,145.0,48.0,uplabs_uplabs_273.xml
 uplabs_273.jpg,375,812,text,54.0,509.0,180.0,17.0,uplabs_uplabs_273.xml
 uplabs_273.jpg,375,812,text,240.0,510.0,85.0,13.0,uplabs_uplabs_273.xml
@@ -880,9 +854,9 @@ uplabs_515.jpg,1080,1920,text,367.0,350.0,344.0,78.0,uplabs_uplabs_515.xml
 uplabs_515.jpg,1080,1920,text,742.0,695.0,137.0,37.0,uplabs_uplabs_515.xml
 uplabs_515.jpg,1080,1920,text,184.0,694.0,173.0,39.0,uplabs_uplabs_515.xml
 uplabs_515.jpg,1080,1920,image,1.0,73.0,1079.0,710.0,uplabs_uplabs_515.xml
-uplabs_515.jpg,1080,1920,edittext,119.0,900.0,841.0,139.0,uplabs_uplabs_515.xml
-uplabs_515.jpg,1080,1920,edittext,120.0,1080.0,840.0,139.0,uplabs_uplabs_515.xml
-uplabs_515.jpg,1080,1920,edittext,120.0,1260.0,841.0,139.0,uplabs_uplabs_515.xml
+uplabs_515.jpg,1080,1920,inputfield,119.0,900.0,841.0,139.0,uplabs_uplabs_515.xml
+uplabs_515.jpg,1080,1920,inputfield,120.0,1080.0,840.0,139.0,uplabs_uplabs_515.xml
+uplabs_515.jpg,1080,1920,inputfield,120.0,1260.0,841.0,139.0,uplabs_uplabs_515.xml
 uplabs_515.jpg,1080,1920,textbutton,120.0,1559.0,841.0,140.0,uplabs_uplabs_515.xml
 uplabs_515.jpg,1080,1920,text,223.0,1791.0,624.0,42.0,uplabs_uplabs_515.xml
 uplabs_313.jpg,373,811,image,1.0,115.0,372.0,296.0,uplabs_uplabs_313.xml
@@ -910,12 +884,12 @@ uplabs_700.jpg,1125,2436,uppertaskbar,106.0,52.0,976.0,40.0,uplabs_uplabs_700.xm
 uplabs_700.jpg,1125,2436,text,934.0,196.0,140.0,54.0,uplabs_uplabs_700.xml
 uplabs_700.jpg,1125,2436,text,52.0,358.0,379.0,111.0,uplabs_uplabs_700.xml
 uplabs_700.jpg,1125,2436,icon,63.0,184.0,38.0,65.0,uplabs_uplabs_700.xml
-uplabs_700.jpg,1125,2436,edittext,49.0,582.0,489.0,145.0,uplabs_uplabs_700.xml
-uplabs_700.jpg,1125,2436,edittext,588.0,582.0,489.0,145.0,uplabs_uplabs_700.xml
-uplabs_700.jpg,1125,2436,edittext,49.0,771.0,1028.0,145.0,uplabs_uplabs_700.xml
-uplabs_700.jpg,1125,2436,edittext,49.0,1221.0,1029.0,145.0,uplabs_uplabs_700.xml
-uplabs_700.jpg,1125,2436,edittext,438.0,1032.0,639.0,145.0,uplabs_uplabs_700.xml
-uplabs_700.jpg,1125,2436,edittext,49.0,1032.0,342.0,145.0,uplabs_uplabs_700.xml
+uplabs_700.jpg,1125,2436,inputfield,49.0,582.0,489.0,145.0,uplabs_uplabs_700.xml
+uplabs_700.jpg,1125,2436,inputfield,588.0,582.0,489.0,145.0,uplabs_uplabs_700.xml
+uplabs_700.jpg,1125,2436,inputfield,49.0,771.0,1028.0,145.0,uplabs_uplabs_700.xml
+uplabs_700.jpg,1125,2436,inputfield,49.0,1221.0,1029.0,145.0,uplabs_uplabs_700.xml
+uplabs_700.jpg,1125,2436,inputfield,438.0,1032.0,639.0,145.0,uplabs_uplabs_700.xml
+uplabs_700.jpg,1125,2436,inputfield,49.0,1032.0,342.0,145.0,uplabs_uplabs_700.xml
 uplabs_700.jpg,1125,2436,text,61.0,975.0,295.0,30.0,uplabs_uplabs_700.xml
 uplabs_700.jpg,1125,2436,text,49.0,1467.0,885.0,93.0,uplabs_uplabs_700.xml
 uplabs_700.jpg,1125,2436,textbutton,48.0,2189.0,1030.0,145.0,uplabs_uplabs_700.xml
@@ -930,10 +904,10 @@ uplabs_506.jpg,1080,1920,text,221.0,526.0,88.0,22.0,uplabs_uplabs_506.xml
 uplabs_506.jpg,1080,1920,text,439.0,220.0,202.0,59.0,uplabs_uplabs_506.xml
 uplabs_506.jpg,1080,1920,textbutton,120.0,1455.0,841.0,136.0,uplabs_uplabs_506.xml
 uplabs_506.jpg,1080,1920,text,467.0,1727.0,145.0,32.0,uplabs_uplabs_506.xml
-uplabs_506.jpg,1080,1920,edittext,120.0,1157.0,841.0,164.0,uplabs_uplabs_506.xml
-uplabs_506.jpg,1080,1920,edittext,120.0,944.0,841.0,164.0,uplabs_uplabs_506.xml
-uplabs_506.jpg,1080,1920,edittext,120.0,732.0,841.0,163.0,uplabs_uplabs_506.xml
-uplabs_506.jpg,1080,1920,edittext,120.0,526.0,841.0,156.0,uplabs_uplabs_506.xml
+uplabs_506.jpg,1080,1920,inputfield,120.0,1157.0,841.0,164.0,uplabs_uplabs_506.xml
+uplabs_506.jpg,1080,1920,inputfield,120.0,944.0,841.0,164.0,uplabs_uplabs_506.xml
+uplabs_506.jpg,1080,1920,inputfield,120.0,732.0,841.0,163.0,uplabs_uplabs_506.xml
+uplabs_506.jpg,1080,1920,inputfield,120.0,526.0,841.0,156.0,uplabs_uplabs_506.xml
 uplabs_705.jpg,375,667,image,65.0,68.0,237.0,223.0,uplabs_uplabs_705.xml
 uplabs_705.jpg,375,667,text,47.0,325.0,281.0,62.0,uplabs_uplabs_705.xml
 uplabs_705.jpg,375,667,pageindicator,157.0,418.0,60.0,11.0,uplabs_uplabs_705.xml
@@ -956,15 +930,15 @@ uplabs_467.jpg,1125,2436,text,50.0,1872.0,390.0,35.0,uplabs_uplabs_467.xml
 uplabs_467.jpg,1125,2436,textbutton,48.0,1946.0,1027.0,134.0,uplabs_uplabs_467.xml
 uplabs_467.jpg,1125,2436,textbutton,48.0,2102.0,1027.0,134.0,uplabs_uplabs_467.xml
 uplabs_467.jpg,1125,2436,switch,870.0,1524.0,157.0,97.0,uplabs_uplabs_467.xml
-uplabs_467.jpg,1125,2436,edittext,48.0,1167.0,1029.0,145.0,uplabs_uplabs_467.xml
-uplabs_467.jpg,1125,2436,edittext,48.0,906.0,1030.0,145.0,uplabs_uplabs_467.xml
-uplabs_467.jpg,1125,2436,edittext,48.0,645.0,1030.0,145.0,uplabs_uplabs_467.xml
+uplabs_467.jpg,1125,2436,inputfield,48.0,1167.0,1029.0,145.0,uplabs_uplabs_467.xml
+uplabs_467.jpg,1125,2436,inputfield,48.0,906.0,1030.0,145.0,uplabs_uplabs_467.xml
+uplabs_467.jpg,1125,2436,inputfield,48.0,645.0,1030.0,145.0,uplabs_uplabs_467.xml
 uplabs_498.jpg,1080,1920,text,161.0,861.0,185.0,38.0,uplabs_uplabs_498.xml
 uplabs_498.jpg,1080,1920,text,160.0,675.0,219.0,38.0,uplabs_uplabs_498.xml
 uplabs_498.jpg,1080,1920,text,435.0,291.0,426.0,94.0,uplabs_uplabs_498.xml
 uplabs_498.jpg,1080,1920,image,219.0,234.0,170.0,190.0,uplabs_uplabs_498.xml
-uplabs_498.jpg,1080,1920,edittext,71.0,628.0,940.0,139.0,uplabs_uplabs_498.xml
-uplabs_498.jpg,1080,1920,edittext,71.0,814.0,940.0,139.0,uplabs_uplabs_498.xml
+uplabs_498.jpg,1080,1920,inputfield,71.0,628.0,940.0,139.0,uplabs_uplabs_498.xml
+uplabs_498.jpg,1080,1920,inputfield,71.0,814.0,940.0,139.0,uplabs_uplabs_498.xml
 uplabs_498.jpg,1080,1920,textbutton,71.0,1113.0,940.0,139.0,uplabs_uplabs_498.xml
 uplabs_498.jpg,1080,1920,text,251.0,1288.0,583.0,41.0,uplabs_uplabs_498.xml
 uplabs_498.jpg,1080,1920,text,262.0,1607.0,558.0,49.0,uplabs_uplabs_498.xml
@@ -1007,21 +981,20 @@ uplabs_262.jpg,375,812,text,29.0,664.0,318.0,39.0,uplabs_uplabs_262.xml
 uplabs_262.jpg,375,812,pageindicator,160.0,547.0,57.0,10.0,uplabs_uplabs_262.xml
 uplabs_262.jpg,375,812,textbutton,147.0,728.0,81.0,44.0,uplabs_uplabs_262.xml
 uplabs_262.jpg,375,812,image,1.0,1.0,374.0,573.0,uplabs_uplabs_262.xml
-uplabs_712.jpg,1080,1920,modal,79.0,239.0,923.0,1444.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,140.0,1229.0,212.0,40.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,142.0,1057.0,176.0,47.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,141.0,885.0,182.0,39.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,141.0,706.0,113.0,41.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,142.0,528.0,218.0,38.0,uplabs_uplabs_712.xml
-uplabs_712.jpg,1080,1920,edittext,141.0,1229.0,807.0,72.0,uplabs_uplabs_712.xml
-uplabs_712.jpg,1080,1920,edittext,142.0,1058.0,806.0,66.0,uplabs_uplabs_712.xml
-uplabs_712.jpg,1080,1920,edittext,141.0,886.0,807.0,62.0,uplabs_uplabs_712.xml
+uplabs_712.jpg,1080,1920,inputfield,141.0,1229.0,807.0,72.0,uplabs_uplabs_712.xml
+uplabs_712.jpg,1080,1920,inputfield,142.0,1058.0,806.0,66.0,uplabs_uplabs_712.xml
+uplabs_712.jpg,1080,1920,inputfield,141.0,886.0,807.0,62.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,452.0,301.0,178.0,49.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,icon,139.0,304.0,25.0,42.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,text,506.0,1382.0,69.0,40.0,uplabs_uplabs_712.xml
 uplabs_712.jpg,1080,1920,textbutton,139.0,1482.0,803.0,140.0,uplabs_uplabs_712.xml
-uplabs_712.jpg,1080,1920,edittext,141.0,527.0,801.0,65.0,uplabs_uplabs_712.xml
-uplabs_712.jpg,1080,1920,edittext,141.0,706.0,806.0,64.0,uplabs_uplabs_712.xml
+uplabs_712.jpg,1080,1920,inputfield,141.0,527.0,801.0,65.0,uplabs_uplabs_712.xml
+uplabs_712.jpg,1080,1920,inputfield,141.0,706.0,806.0,64.0,uplabs_uplabs_712.xml
 uplabs_33.jpg,750,1624,uppertaskbar,63.0,28.0,653.0,31.0,uplabs_uplabs_33.xml
 uplabs_33.jpg,750,1624,text,640.0,111.0,72.0,30.0,uplabs_uplabs_33.xml
 uplabs_33.jpg,750,1624,image,95.0,248.0,563.0,566.0,uplabs_uplabs_33.xml
@@ -1031,17 +1004,17 @@ uplabs_33.jpg,750,1624,pageindicator,311.0,1497.0,131.0,27.0,uplabs_uplabs_33.xm
 uplabs_246.jpg,480,852,text,177.0,337.0,130.0,21.0,uplabs_uplabs_246.xml
 uplabs_246.jpg,480,852,text,182.0,435.0,119.0,24.0,uplabs_uplabs_246.xml
 uplabs_246.jpg,480,852,image,147.0,93.0,188.0,150.0,uplabs_uplabs_246.xml
-uplabs_246.jpg,480,852,edittext,34.0,311.0,413.0,68.0,uplabs_uplabs_246.xml
-uplabs_246.jpg,480,852,edittext,34.0,412.0,413.0,68.0,uplabs_uplabs_246.xml
+uplabs_246.jpg,480,852,inputfield,34.0,311.0,413.0,68.0,uplabs_uplabs_246.xml
+uplabs_246.jpg,480,852,inputfield,34.0,412.0,413.0,68.0,uplabs_uplabs_246.xml
 uplabs_246.jpg,480,852,text,150.0,799.0,184.0,25.0,uplabs_uplabs_246.xml
 uplabs_246.jpg,480,852,textbutton,34.0,688.0,414.0,69.0,uplabs_uplabs_246.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,image,188.0,7.0,676.0,642.0,uplabs_Login_Teacher_UniversityUI.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,text,314.0,864.0,448.0,74.0,uplabs_Login_Teacher_UniversityUI.xml
-Login_Teacher_UniversityUI.jpg,1080,1794,edittext,147.0,1005.0,787.0,102.0,uplabs_Login_Teacher_UniversityUI.xml
+Login_Teacher_UniversityUI.jpg,1080,1794,inputfield,147.0,1005.0,787.0,102.0,uplabs_Login_Teacher_UniversityUI.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,icon,178.0,1006.0,52.0,55.0,uplabs_Login_Teacher_UniversityUI.xml
-Login_Teacher_UniversityUI.jpg,1080,1794,edittext,147.0,1170.0,787.0,101.0,uplabs_Login_Teacher_UniversityUI.xml
+Login_Teacher_UniversityUI.jpg,1080,1794,inputfield,147.0,1170.0,787.0,101.0,uplabs_Login_Teacher_UniversityUI.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,icon,179.0,1170.0,50.0,55.0,uplabs_Login_Teacher_UniversityUI.xml
-Login_Teacher_UniversityUI.jpg,1080,1794,checkedtextview,176.0,1308.0,254.0,51.0,uplabs_Login_Teacher_UniversityUI.xml
+Login_Teacher_UniversityUI.jpg,1080,1794,checkedview,176.0,1308.0,254.0,51.0,uplabs_Login_Teacher_UniversityUI.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,text,620.0,1320.0,232.0,33.0,uplabs_Login_Teacher_UniversityUI.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,text,243.0,1321.0,186.0,25.0,uplabs_Login_Teacher_UniversityUI.xml
 Login_Teacher_UniversityUI.jpg,1080,1794,textbutton,158.0,1395.0,765.0,128.0,uplabs_Login_Teacher_UniversityUI.xml
@@ -1054,8 +1027,8 @@ uplabs_251.jpg,375,812,icon,52.0,360.0,17.0,17.0,uplabs_uplabs_251.xml
 uplabs_251.jpg,375,812,icon,53.0,428.0,15.0,17.0,uplabs_uplabs_251.xml
 uplabs_251.jpg,375,812,image,147.0,110.0,82.0,85.0,uplabs_uplabs_251.xml
 uplabs_251.jpg,375,812,text,46.0,281.0,60.0,22.0,uplabs_uplabs_251.xml
-uplabs_251.jpg,375,812,edittext,38.0,360.0,300.0,35.0,uplabs_uplabs_251.xml
-uplabs_251.jpg,375,812,edittext,39.0,428.0,300.0,35.0,uplabs_uplabs_251.xml
+uplabs_251.jpg,375,812,inputfield,38.0,360.0,300.0,35.0,uplabs_uplabs_251.xml
+uplabs_251.jpg,375,812,inputfield,39.0,428.0,300.0,35.0,uplabs_uplabs_251.xml
 uplabs_251.jpg,375,812,text,207.0,485.0,123.0,16.0,uplabs_uplabs_251.xml
 uplabs_251.jpg,375,812,textbutton,39.0,536.0,300.0,53.0,uplabs_uplabs_251.xml
 uplabs_251.jpg,375,812,icon,140.0,657.0,12.0,24.0,uplabs_uplabs_251.xml
@@ -1086,18 +1059,18 @@ uplabs_123.jpg,1125,2436,textbutton,90.0,2049.0,946.0,150.0,uplabs_uplabs_123.xm
 uplabs_644.jpg,1080,1920,text,437.0,46.0,208.0,59.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,icon,63.0,54.0,25.0,42.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,icon,439.0,318.0,207.0,207.0,uplabs_uplabs_644.xml
-uplabs_644.jpg,1080,1920,edittext,121.0,631.0,837.0,125.0,uplabs_uplabs_644.xml
+uplabs_644.jpg,1080,1920,inputfield,121.0,631.0,837.0,125.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,text,165.0,674.0,124.0,37.0,uplabs_uplabs_644.xml
-uplabs_644.jpg,1080,1920,edittext,122.0,815.0,836.0,125.0,uplabs_uplabs_644.xml
+uplabs_644.jpg,1080,1920,inputfield,122.0,815.0,836.0,125.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,text,163.0,858.0,180.0,37.0,uplabs_uplabs_644.xml
-uplabs_644.jpg,1080,1920,edittext,121.0,1000.0,837.0,125.0,uplabs_uplabs_644.xml
+uplabs_644.jpg,1080,1920,inputfield,121.0,1000.0,837.0,125.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,text,164.0,1041.0,111.0,38.0,uplabs_uplabs_644.xml
-uplabs_644.jpg,1080,1920,edittext,122.0,1185.0,836.0,125.0,uplabs_uplabs_644.xml
+uplabs_644.jpg,1080,1920,inputfield,122.0,1185.0,836.0,125.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,text,163.0,1227.0,210.0,39.0,uplabs_uplabs_644.xml
-uplabs_644.jpg,1080,1920,edittext,121.0,1370.0,837.0,124.0,uplabs_uplabs_644.xml
+uplabs_644.jpg,1080,1920,inputfield,121.0,1370.0,837.0,124.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,text,162.0,1411.0,394.0,39.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,text,213.0,1568.0,654.0,41.0,uplabs_uplabs_644.xml
-uplabs_644.jpg,1080,1920,checkedtextview,121.0,1555.0,746.0,59.0,uplabs_uplabs_644.xml
+uplabs_644.jpg,1080,1920,checkedview,121.0,1555.0,746.0,59.0,uplabs_uplabs_644.xml
 uplabs_644.jpg,1080,1920,textbutton,122.0,1670.0,838.0,136.0,uplabs_uplabs_644.xml
 uplabs_452.jpg,360,720,image,23.0,72.0,314.0,271.0,uplabs_uplabs_452.xml
 uplabs_452.jpg,360,720,pageindicator,149.0,455.0,64.0,18.0,uplabs_uplabs_452.xml
@@ -1107,8 +1080,8 @@ Login_FeedMe.jpg,1080,1794,text,94.0,718.0,168.0,31.0,uplabs_Login_FeedMe.xml
 Login_FeedMe.jpg,1080,1794,text,94.0,560.0,171.0,29.0,uplabs_Login_FeedMe.xml
 Login_FeedMe.jpg,1080,1794,text,101.0,321.0,407.0,62.0,uplabs_Login_FeedMe.xml
 Login_FeedMe.jpg,1080,1794,text,561.0,329.0,122.0,42.0,uplabs_Login_FeedMe.xml
-Login_FeedMe.jpg,1080,1794,edittext,91.0,560.0,902.0,60.0,uplabs_Login_FeedMe.xml
-Login_FeedMe.jpg,1080,1794,edittext,90.0,718.0,903.0,62.0,uplabs_Login_FeedMe.xml
+Login_FeedMe.jpg,1080,1794,inputfield,91.0,560.0,902.0,60.0,uplabs_Login_FeedMe.xml
+Login_FeedMe.jpg,1080,1794,inputfield,90.0,718.0,903.0,62.0,uplabs_Login_FeedMe.xml
 Login_FeedMe.jpg,1080,1794,textbutton,91.0,918.0,902.0,135.0,uplabs_Login_FeedMe.xml
 Login_FeedMe.jpg,1080,1794,textbutton,91.0,1456.0,902.0,153.0,uplabs_Login_FeedMe.xml
 Login_FeedMe.jpg,1080,1794,text,277.0,1679.0,528.0,40.0,uplabs_Login_FeedMe.xml
@@ -1118,8 +1091,8 @@ uplabs_726.jpg,1125,2436,text,465.0,1011.0,228.0,41.0,uplabs_uplabs_726.xml
 uplabs_726.jpg,1125,2436,text,452.0,859.0,249.0,41.0,uplabs_uplabs_726.xml
 uplabs_726.jpg,1125,2436,text,494.0,140.0,142.0,58.0,uplabs_uplabs_726.xml
 uplabs_726.jpg,1125,2436,image,442.0,457.0,263.0,264.0,uplabs_uplabs_726.xml
-uplabs_726.jpg,1125,2436,edittext,220.0,859.0,694.0,77.0,uplabs_uplabs_726.xml
-uplabs_726.jpg,1125,2436,edittext,220.0,1010.0,694.0,88.0,uplabs_uplabs_726.xml
+uplabs_726.jpg,1125,2436,inputfield,220.0,859.0,694.0,77.0,uplabs_uplabs_726.xml
+uplabs_726.jpg,1125,2436,inputfield,220.0,1010.0,694.0,88.0,uplabs_uplabs_726.xml
 uplabs_726.jpg,1125,2436,textbutton,368.0,1406.0,417.0,146.0,uplabs_uplabs_726.xml
 uplabs_726.jpg,1125,2436,text,375.0,2036.0,392.0,45.0,uplabs_uplabs_726.xml
 uplabs_256.jpg,1080,1920,text,162.0,1209.0,187.0,33.0,uplabs_uplabs_256.xml
@@ -1129,8 +1102,8 @@ uplabs_256.jpg,1080,1920,icon,96.0,1017.0,44.0,32.0,uplabs_uplabs_256.xml
 uplabs_256.jpg,1080,1920,uppertaskbar,2.0,1.0,1078.0,72.0,uplabs_uplabs_256.xml
 uplabs_256.jpg,1080,1920,text,365.0,127.0,351.0,60.0,uplabs_uplabs_256.xml
 uplabs_256.jpg,1080,1920,image,59.0,300.0,963.0,584.0,uplabs_uplabs_256.xml
-uplabs_256.jpg,1080,1920,edittext,96.0,1013.0,889.0,66.0,uplabs_uplabs_256.xml
-uplabs_256.jpg,1080,1920,edittext,96.0,1201.0,889.0,73.0,uplabs_uplabs_256.xml
+uplabs_256.jpg,1080,1920,inputfield,96.0,1013.0,889.0,66.0,uplabs_uplabs_256.xml
+uplabs_256.jpg,1080,1920,inputfield,96.0,1201.0,889.0,73.0,uplabs_uplabs_256.xml
 uplabs_256.jpg,1080,1920,text,515.0,1512.0,52.0,29.0,uplabs_uplabs_256.xml
 uplabs_256.jpg,1080,1920,text,173.0,1763.0,444.0,34.0,uplabs_uplabs_256.xml
 uplabs_256.jpg,1080,1920,text,639.0,1764.0,347.0,32.0,uplabs_uplabs_256.xml
@@ -1159,7 +1132,7 @@ Login_Trevor.jpg,1080,1794,icon,92.0,536.0,55.0,55.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,text,195.0,547.0,223.0,36.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,icon,98.0,760.0,43.0,55.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,text,196.0,769.0,207.0,38.0,uplabs_Login_Trevor.xml
-Login_Trevor.jpg,1080,1794,checkedtextview,84.0,934.0,330.0,51.0,uplabs_Login_Trevor.xml
+Login_Trevor.jpg,1080,1794,checkedview,84.0,934.0,330.0,51.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,text,161.0,942.0,253.0,33.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,text,692.0,943.0,309.0,39.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,textbutton,66.0,1071.0,949.0,132.0,uplabs_Login_Trevor.xml
@@ -1168,8 +1141,8 @@ Login_Trevor.jpg,1080,1794,icon,619.0,1431.0,159.0,159.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,icon,307.0,1435.0,152.0,151.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,icon,466.0,1436.0,149.0,149.0,uplabs_Login_Trevor.xml
 Login_Trevor.jpg,1080,1794,text,274.0,1698.0,533.0,41.0,uplabs_Login_Trevor.xml
-Login_Trevor.jpg,1080,1794,edittext,65.0,708.0,950.0,159.0,uplabs_Login_Trevor.xml
-Login_Trevor.jpg,1080,1794,edittext,66.0,484.0,949.0,160.0,uplabs_Login_Trevor.xml
+Login_Trevor.jpg,1080,1794,inputfield,65.0,708.0,950.0,159.0,uplabs_Login_Trevor.xml
+Login_Trevor.jpg,1080,1794,inputfield,66.0,484.0,949.0,160.0,uplabs_Login_Trevor.xml
 uplabs_595.jpg,1080,1920,text,89.0,1523.0,210.0,39.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,text,86.0,1351.0,178.0,40.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,text,88.0,1171.0,112.0,39.0,uplabs_uplabs_595.xml
@@ -1177,10 +1150,10 @@ uplabs_595.jpg,1080,1920,text,88.0,993.0,127.0,38.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,icon,394.0,221.0,296.0,296.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,text,184.0,791.0,172.0,51.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,image,1.0,1.0,1079.0,740.0,uplabs_uplabs_595.xml
-uplabs_595.jpg,1080,1920,edittext,88.0,993.0,992.0,65.0,uplabs_uplabs_595.xml
-uplabs_595.jpg,1080,1920,edittext,88.0,1171.0,992.0,63.0,uplabs_uplabs_595.xml
-uplabs_595.jpg,1080,1920,edittext,85.0,1351.0,995.0,61.0,uplabs_uplabs_595.xml
-uplabs_595.jpg,1080,1920,edittext,88.0,1523.0,992.0,66.0,uplabs_uplabs_595.xml
+uplabs_595.jpg,1080,1920,inputfield,88.0,993.0,992.0,65.0,uplabs_uplabs_595.xml
+uplabs_595.jpg,1080,1920,inputfield,88.0,1171.0,992.0,63.0,uplabs_uplabs_595.xml
+uplabs_595.jpg,1080,1920,inputfield,85.0,1351.0,995.0,61.0,uplabs_uplabs_595.xml
+uplabs_595.jpg,1080,1920,inputfield,88.0,1523.0,992.0,66.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,textbutton,1.0,1765.0,1079.0,155.0,uplabs_uplabs_595.xml
 uplabs_595.jpg,1080,1920,textbutton,541.0,741.0,539.0,141.0,uplabs_uplabs_595.xml
 uplabs_225.jpg,358,639,text,14.0,409.0,63.0,12.0,uplabs_uplabs_225.xml
@@ -1188,10 +1161,10 @@ uplabs_225.jpg,358,639,text,14.0,362.0,36.0,13.0,uplabs_uplabs_225.xml
 uplabs_225.jpg,358,639,text,14.0,317.0,67.0,12.0,uplabs_uplabs_225.xml
 uplabs_225.jpg,358,639,text,14.0,271.0,68.0,12.0,uplabs_uplabs_225.xml
 uplabs_225.jpg,358,639,uppertaskbar,1.0,1.0,357.0,20.0,uplabs_uplabs_225.xml
-uplabs_225.jpg,358,639,edittext,13.0,271.0,332.0,19.0,uplabs_uplabs_225.xml
-uplabs_225.jpg,358,639,edittext,13.0,317.0,332.0,19.0,uplabs_uplabs_225.xml
-uplabs_225.jpg,358,639,edittext,14.0,362.0,331.0,20.0,uplabs_uplabs_225.xml
-uplabs_225.jpg,358,639,edittext,14.0,409.0,332.0,19.0,uplabs_uplabs_225.xml
+uplabs_225.jpg,358,639,inputfield,13.0,271.0,332.0,19.0,uplabs_uplabs_225.xml
+uplabs_225.jpg,358,639,inputfield,13.0,317.0,332.0,19.0,uplabs_uplabs_225.xml
+uplabs_225.jpg,358,639,inputfield,14.0,362.0,331.0,20.0,uplabs_uplabs_225.xml
+uplabs_225.jpg,358,639,inputfield,14.0,409.0,332.0,19.0,uplabs_uplabs_225.xml
 uplabs_225.jpg,358,639,text,14.0,118.0,84.0,19.0,uplabs_uplabs_225.xml
 uplabs_225.jpg,358,639,text,15.0,141.0,130.0,14.0,uplabs_uplabs_225.xml
 uplabs_225.jpg,358,639,textbutton,10.0,441.0,339.0,44.0,uplabs_uplabs_225.xml
@@ -1212,7 +1185,6 @@ uplabs_421.jpg,375,667,text,115.0,366.0,144.0,23.0,uplabs_uplabs_421.xml
 uplabs_421.jpg,375,667,text,78.0,402.0,221.0,111.0,uplabs_uplabs_421.xml
 uplabs_421.jpg,375,667,pageindicator,31.0,629.0,56.0,8.0,uplabs_uplabs_421.xml
 uplabs_421.jpg,375,667,icon,329.0,626.0,17.0,13.0,uplabs_uplabs_421.xml
-uplabs_421.jpg,375,667,card,41.0,75.0,296.0,476.0,uplabs_uplabs_421.xml
 uplabs_353.jpg,902,1953,pageindicator,400.0,1163.0,103.0,19.0,uplabs_uplabs_353.xml
 uplabs_353.jpg,902,1953,text,159.0,1293.0,586.0,55.0,uplabs_uplabs_353.xml
 uplabs_353.jpg,902,1953,text,123.0,1400.0,656.0,174.0,uplabs_uplabs_353.xml
@@ -1222,10 +1194,10 @@ uplabs_596.jpg,1125,2436,uppertaskbar,104.0,52.0,978.0,39.0,uplabs_uplabs_596.xm
 uplabs_596.jpg,1125,2436,backgroundimage,1.0,1.0,1124.0,2435.0,uplabs_uplabs_596.xml
 uplabs_596.jpg,1125,2436,icon,89.0,178.0,30.0,54.0,uplabs_uplabs_596.xml
 uplabs_596.jpg,1125,2436,text,114.0,469.0,805.0,77.0,uplabs_uplabs_596.xml
-uplabs_596.jpg,1125,2436,edittext,178.0,1033.0,911.0,63.0,uplabs_uplabs_596.xml
-uplabs_596.jpg,1125,2436,edittext,178.0,1311.0,911.0,63.0,uplabs_uplabs_596.xml
+uplabs_596.jpg,1125,2436,inputfield,178.0,1033.0,911.0,63.0,uplabs_uplabs_596.xml
+uplabs_596.jpg,1125,2436,inputfield,178.0,1311.0,911.0,63.0,uplabs_uplabs_596.xml
 uplabs_596.jpg,1125,2436,icon,1008.0,1311.0,55.0,37.0,uplabs_uplabs_596.xml
-uplabs_596.jpg,1125,2436,checkedtextview,186.0,1556.0,883.0,77.0,uplabs_uplabs_596.xml
+uplabs_596.jpg,1125,2436,checkedview,186.0,1556.0,883.0,77.0,uplabs_uplabs_596.xml
 uplabs_596.jpg,1125,2436,text,309.0,1576.0,760.0,46.0,uplabs_uplabs_596.xml
 uplabs_596.jpg,1125,2436,textbutton,690.0,1746.0,435.0,150.0,uplabs_uplabs_596.xml
 uplabs_596.jpg,1125,2436,text,187.0,1802.0,243.0,43.0,uplabs_uplabs_596.xml
@@ -1242,10 +1214,10 @@ uplabs_569.jpg,750,1624,text,31.0,1277.0,75.0,26.0,uplabs_uplabs_569.xml
 uplabs_569.jpg,750,1624,text,31.0,1188.0,155.0,25.0,uplabs_uplabs_569.xml
 uplabs_569.jpg,750,1624,text,31.0,1098.0,83.0,25.0,uplabs_uplabs_569.xml
 uplabs_569.jpg,750,1624,text,217.0,849.0,318.0,71.0,uplabs_uplabs_569.xml
-uplabs_569.jpg,750,1624,edittext,27.0,1098.0,696.0,45.0,uplabs_uplabs_569.xml
-uplabs_569.jpg,750,1624,edittext,27.0,1188.0,696.0,45.0,uplabs_uplabs_569.xml
-uplabs_569.jpg,750,1624,edittext,27.0,1277.0,696.0,46.0,uplabs_uplabs_569.xml
-uplabs_569.jpg,750,1624,edittext,27.0,1367.0,696.0,46.0,uplabs_uplabs_569.xml
+uplabs_569.jpg,750,1624,inputfield,27.0,1098.0,696.0,45.0,uplabs_uplabs_569.xml
+uplabs_569.jpg,750,1624,inputfield,27.0,1188.0,696.0,45.0,uplabs_uplabs_569.xml
+uplabs_569.jpg,750,1624,inputfield,27.0,1277.0,696.0,46.0,uplabs_uplabs_569.xml
+uplabs_569.jpg,750,1624,inputfield,27.0,1367.0,696.0,46.0,uplabs_uplabs_569.xml
 uplabs_569.jpg,750,1624,textbutton,28.0,1472.0,695.0,101.0,uplabs_uplabs_569.xml
 uplabs_569.jpg,750,1624,textbutton,29.0,972.0,345.0,81.0,uplabs_uplabs_569.xml
 uplabs_569.jpg,750,1624,textbutton,374.0,972.0,347.0,81.0,uplabs_uplabs_569.xml
@@ -1275,17 +1247,17 @@ uplabs_346.jpg,375,812,textbutton,136.0,749.0,104.0,38.0,uplabs_uplabs_346.xml
 uplabs_52.jpg,1080,1920,text,365.0,127.0,351.0,60.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,icon,48.0,136.0,46.0,44.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,image,59.0,300.0,963.0,584.0,uplabs_uplabs_52.xml
-uplabs_52.jpg,1080,1920,edittext,96.0,1013.0,889.0,66.0,uplabs_uplabs_52.xml
+uplabs_52.jpg,1080,1920,inputfield,96.0,1013.0,889.0,66.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,163.0,1014.0,106.0,33.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,icon,96.0,1017.0,43.0,31.0,uplabs_uplabs_52.xml
-uplabs_52.jpg,1080,1920,edittext,96.0,1201.0,889.0,73.0,uplabs_uplabs_52.xml
+uplabs_52.jpg,1080,1920,inputfield,96.0,1201.0,889.0,73.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,icon,102.0,1202.0,32.0,43.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,162.0,1209.0,187.0,33.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,96.0,1364.0,114.0,33.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,373.0,1364.0,156.0,34.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,630.0,1364.0,158.0,34.0,uplabs_uplabs_52.xml
-uplabs_52.jpg,1080,1920,checkedtextview,580.0,1362.0,209.0,40.0,uplabs_uplabs_52.xml
-uplabs_52.jpg,1080,1920,checkedtextview,323.0,1363.0,207.0,39.0,uplabs_uplabs_52.xml
+uplabs_52.jpg,1080,1920,checkedview,580.0,1362.0,209.0,40.0,uplabs_uplabs_52.xml
+uplabs_52.jpg,1080,1920,checkedview,323.0,1363.0,207.0,39.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,textbutton,96.0,1493.0,889.0,121.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,211.0,1671.0,504.0,43.0,uplabs_uplabs_52.xml
 uplabs_52.jpg,1080,1920,text,738.0,1672.0,248.0,33.0,uplabs_uplabs_52.xml
@@ -1307,8 +1279,8 @@ uplabs_747.jpg,750,1334,text,126.0,75.0,163.0,57.0,uplabs_uplabs_747.xml
 uplabs_747.jpg,750,1334,text,448.0,76.0,183.0,55.0,uplabs_uplabs_747.xml
 uplabs_747.jpg,750,1334,text,468.0,613.0,232.0,28.0,uplabs_uplabs_747.xml
 uplabs_747.jpg,750,1334,text,52.0,613.0,190.0,23.0,uplabs_uplabs_747.xml
-uplabs_747.jpg,750,1334,edittext,48.0,342.0,653.0,60.0,uplabs_uplabs_747.xml
-uplabs_747.jpg,750,1334,edittext,49.0,520.0,653.0,60.0,uplabs_uplabs_747.xml
+uplabs_747.jpg,750,1334,inputfield,48.0,342.0,653.0,60.0,uplabs_uplabs_747.xml
+uplabs_747.jpg,750,1334,inputfield,49.0,520.0,653.0,60.0,uplabs_uplabs_747.xml
 uplabs_747.jpg,750,1334,switch,266.0,608.0,69.0,41.0,uplabs_uplabs_747.xml
 uplabs_747.jpg,750,1334,text,363.0,966.0,27.0,18.0,uplabs_uplabs_747.xml
 uplabs_747.jpg,750,1334,text,235.0,1231.0,284.0,46.0,uplabs_uplabs_747.xml
@@ -1332,9 +1304,9 @@ uplabs_828.jpg,1125,2001,text,406.0,492.0,315.0,174.0,uplabs_uplabs_828.xml
 uplabs_828.jpg,1125,2001,icon,85.0,81.0,42.0,68.0,uplabs_uplabs_828.xml
 uplabs_828.jpg,1125,2001,textbutton,135.0,1578.0,856.0,127.0,uplabs_uplabs_828.xml
 uplabs_828.jpg,1125,2001,text,266.0,1915.0,557.0,42.0,uplabs_uplabs_828.xml
-uplabs_828.jpg,1125,2001,edittext,135.0,912.0,856.0,127.0,uplabs_uplabs_828.xml
-uplabs_828.jpg,1125,2001,edittext,135.0,1080.0,856.0,127.0,uplabs_uplabs_828.xml
-uplabs_828.jpg,1125,2001,edittext,135.0,1248.0,856.0,127.0,uplabs_uplabs_828.xml
+uplabs_828.jpg,1125,2001,inputfield,135.0,912.0,856.0,127.0,uplabs_uplabs_828.xml
+uplabs_828.jpg,1125,2001,inputfield,135.0,1080.0,856.0,127.0,uplabs_uplabs_828.xml
+uplabs_828.jpg,1125,2001,inputfield,135.0,1248.0,856.0,127.0,uplabs_uplabs_828.xml
 uplabs_828.jpg,1125,2001,backgroundimage,1.0,1.0,1124.0,2000.0,uplabs_uplabs_828.xml
 uplabs_431.jpg,1440,2560,image,155.0,368.0,1195.0,907.0,uplabs_uplabs_431.xml
 uplabs_431.jpg,1440,2560,text,506.0,1457.0,429.0,58.0,uplabs_uplabs_431.xml
@@ -1353,8 +1325,8 @@ Login_CryptoStar.jpg,1080,1794,text,117.0,688.0,163.0,32.0,uplabs_Login_CryptoSt
 Login_CryptoStar.jpg,1080,1794,icon,89.0,191.0,61.0,35.0,uplabs_Login_CryptoStar.xml
 Login_CryptoStar.jpg,1080,1794,text,402.0,185.0,463.0,49.0,uplabs_Login_CryptoStar.xml
 Login_CryptoStar.jpg,1080,1794,text,485.0,262.0,292.0,36.0,uplabs_Login_CryptoStar.xml
-Login_CryptoStar.jpg,1080,1794,edittext,115.0,688.0,851.0,51.0,uplabs_Login_CryptoStar.xml
-Login_CryptoStar.jpg,1080,1794,edittext,115.0,864.0,850.0,54.0,uplabs_Login_CryptoStar.xml
+Login_CryptoStar.jpg,1080,1794,inputfield,115.0,688.0,851.0,51.0,uplabs_Login_CryptoStar.xml
+Login_CryptoStar.jpg,1080,1794,inputfield,115.0,864.0,850.0,54.0,uplabs_Login_CryptoStar.xml
 Login_CryptoStar.jpg,1080,1794,textbutton,202.0,1521.0,679.0,44.0,uplabs_Login_CryptoStar.xml
 Login_CryptoStar.jpg,1080,1794,textbutton,51.0,1616.0,979.0,128.0,uplabs_Login_CryptoStar.xml
 Login_CryptoStar.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,uplabs_Login_CryptoStar.xml
@@ -1371,8 +1343,8 @@ uplabs_427.jpg,375,812,icon,287.0,535.0,16.0,17.0,uplabs_uplabs_427.xml
 uplabs_427.jpg,375,812,icon,289.0,598.0,14.0,16.0,uplabs_uplabs_427.xml
 uplabs_427.jpg,375,812,image,147.0,192.0,82.0,86.0,uplabs_uplabs_427.xml
 uplabs_427.jpg,375,812,image,1.0,1.0,374.0,472.0,uplabs_uplabs_427.xml
-uplabs_427.jpg,375,812,edittext,53.0,523.0,270.0,44.0,uplabs_uplabs_427.xml
-uplabs_427.jpg,375,812,edittext,53.0,582.0,270.0,44.0,uplabs_uplabs_427.xml
+uplabs_427.jpg,375,812,inputfield,53.0,523.0,270.0,44.0,uplabs_uplabs_427.xml
+uplabs_427.jpg,375,812,inputfield,53.0,582.0,270.0,44.0,uplabs_uplabs_427.xml
 uplabs_427.jpg,375,812,text,218.0,647.0,101.0,13.0,uplabs_uplabs_427.xml
 uplabs_427.jpg,375,812,textbutton,53.0,688.0,270.0,44.0,uplabs_uplabs_427.xml
 uplabs_427.jpg,375,812,text,126.0,771.0,123.0,11.0,uplabs_uplabs_427.xml
@@ -1410,11 +1382,11 @@ uplabs_624.jpg,1125,2436,text,411.0,209.0,304.0,84.0,uplabs_uplabs_624.xml
 uplabs_624.jpg,1125,2436,text,352.0,313.0,422.0,35.0,uplabs_uplabs_624.xml
 uplabs_624.jpg,1125,2436,text,149.0,1767.0,828.0,49.0,uplabs_uplabs_624.xml
 uplabs_624.jpg,1125,2436,textbutton,44.0,2044.0,1039.0,204.0,uplabs_uplabs_624.xml
-uplabs_624.jpg,1125,2436,edittext,92.0,1502.0,939.0,162.0,uplabs_uplabs_624.xml
-uplabs_624.jpg,1125,2436,edittext,92.0,1281.0,939.0,162.0,uplabs_uplabs_624.xml
-uplabs_624.jpg,1125,2436,edittext,92.0,1060.0,939.0,162.0,uplabs_uplabs_624.xml
-uplabs_624.jpg,1125,2436,edittext,93.0,840.0,938.0,162.0,uplabs_uplabs_624.xml
-uplabs_624.jpg,1125,2436,edittext,92.0,619.0,938.0,162.0,uplabs_uplabs_624.xml
+uplabs_624.jpg,1125,2436,inputfield,92.0,1502.0,939.0,162.0,uplabs_uplabs_624.xml
+uplabs_624.jpg,1125,2436,inputfield,92.0,1281.0,939.0,162.0,uplabs_uplabs_624.xml
+uplabs_624.jpg,1125,2436,inputfield,92.0,1060.0,939.0,162.0,uplabs_uplabs_624.xml
+uplabs_624.jpg,1125,2436,inputfield,93.0,840.0,938.0,162.0,uplabs_uplabs_624.xml
+uplabs_624.jpg,1125,2436,inputfield,92.0,619.0,938.0,162.0,uplabs_uplabs_624.xml
 uplabs_195.jpg,1081,1925,image,1.0,1.0,1080.0,1140.0,uplabs_uplabs_195.xml
 uplabs_195.jpg,1081,1925,text,170.0,1306.0,737.0,46.0,uplabs_uplabs_195.xml
 uplabs_195.jpg,1081,1925,text,96.0,1417.0,911.0,129.0,uplabs_uplabs_195.xml
@@ -1580,7 +1552,7 @@ Android_596.jpg,720,1280,backgroundimage,1.0,44.0,719.0,1236.0,Android_Android_5
 Android_151.jpg,720,1280,text,65.0,453.0,315.0,32.0,Android_Android_151.xml
 Android_151.jpg,720,1280,text,128.0,77.0,283.0,31.0,Android_Android_151.xml
 Android_151.jpg,720,1280,text,579.0,455.0,80.0,21.0,Android_Android_151.xml
-Android_151.jpg,720,1280,edittext,60.0,444.0,601.0,51.0,Android_Android_151.xml
+Android_151.jpg,720,1280,inputfield,60.0,444.0,601.0,51.0,Android_Android_151.xml
 Android_151.jpg,720,1280,icon,35.0,77.0,29.0,29.0,Android_Android_151.xml
 Android_151.jpg,720,1280,image,108.0,141.0,504.0,218.0,Android_Android_151.xml
 Android_151.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_151.xml
@@ -1618,15 +1590,15 @@ Android_622.jpg,720,1280,image,371.0,781.0,306.0,204.0,Android_Android_622.xml
 Android_622.jpg,720,1280,image,371.0,200.0,306.0,205.0,Android_Android_622.xml
 Android_622.jpg,720,1280,image,44.0,201.0,306.0,204.0,Android_Android_622.xml
 Android_622.jpg,720,1280,icon,80.0,106.0,20.0,19.0,Android_Android_622.xml
-Android_622.jpg,720,1280,edittext,48.0,73.0,626.0,85.0,Android_Android_622.xml
+Android_622.jpg,720,1280,inputfield,48.0,73.0,626.0,85.0,Android_Android_622.xml
 Android_622.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,33.0,Android_Android_622.xml
 Android_77.jpg,720,1280,text,45.0,205.0,197.0,25.0,Android_Android_77.xml
 Android_77.jpg,720,1280,text,44.0,368.0,142.0,24.0,Android_Android_77.xml
 Android_77.jpg,720,1280,text,45.0,529.0,132.0,25.0,Android_Android_77.xml
-Android_77.jpg,720,1280,edittext,42.0,524.0,629.0,47.0,Android_Android_77.xml
-Android_77.jpg,720,1280,edittext,42.0,368.0,629.0,39.0,Android_Android_77.xml
+Android_77.jpg,720,1280,inputfield,42.0,524.0,629.0,47.0,Android_Android_77.xml
+Android_77.jpg,720,1280,inputfield,42.0,368.0,629.0,39.0,Android_Android_77.xml
 Android_77.jpg,720,1280,textbutton,558.0,1195.0,141.0,64.0,Android_Android_77.xml
-Android_77.jpg,720,1280,edittext,43.0,205.0,629.0,42.0,Android_Android_77.xml
+Android_77.jpg,720,1280,inputfield,43.0,205.0,629.0,42.0,Android_Android_77.xml
 Android_77.jpg,720,1280,icon,617.0,525.0,39.0,35.0,Android_Android_77.xml
 Android_77.jpg,720,1280,icon,34.0,78.0,30.0,29.0,Android_Android_77.xml
 Android_77.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_77.xml
@@ -1705,7 +1677,7 @@ Android_369.jpg,720,1280,text,37.0,75.0,197.0,30.0,Android_Android_369.xml
 Android_369.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_369.xml
 Android_341.jpg,720,1280,text,37.0,450.0,472.0,27.0,Android_Android_341.xml
 Android_341.jpg,720,1280,text,473.0,919.0,72.0,26.0,Android_Android_341.xml
-Android_341.jpg,720,1280,edittext,35.0,450.0,651.0,51.0,Android_Android_341.xml
+Android_341.jpg,720,1280,inputfield,35.0,450.0,651.0,51.0,Android_Android_341.xml
 Android_341.jpg,720,1280,text,142.0,323.0,434.0,34.0,Android_Android_341.xml
 Android_341.jpg,720,1280,text,343.0,561.0,34.0,22.0,Android_Android_341.xml
 Android_341.jpg,720,1280,text,165.0,918.0,298.0,27.0,Android_Android_341.xml
@@ -1718,12 +1690,11 @@ Android_2.jpg,720,1280,text,107.0,906.0,134.0,24.0,Android_Android_2.xml
 Android_2.jpg,720,1280,text,108.0,775.0,70.0,22.0,Android_Android_2.xml
 Android_2.jpg,720,1280,text,210.0,229.0,383.0,41.0,Android_Android_2.xml
 Android_2.jpg,720,1280,image,127.0,212.0,72.0,74.0,Android_Android_2.xml
-Android_2.jpg,720,1280,modal,42.0,364.0,637.0,916.0,Android_Android_2.xml
 Android_2.jpg,720,1280,icon,330.0,401.0,61.0,22.0,Android_Android_2.xml
 Android_2.jpg,720,1280,textbutton,98.0,459.0,525.0,85.0,Android_Android_2.xml
 Android_2.jpg,720,1280,textbutton,98.0,589.0,525.0,85.0,Android_Android_2.xml
-Android_2.jpg,720,1280,edittext,105.0,775.0,513.0,44.0,Android_Android_2.xml
-Android_2.jpg,720,1280,edittext,104.0,906.0,513.0,44.0,Android_Android_2.xml
+Android_2.jpg,720,1280,inputfield,105.0,775.0,513.0,44.0,Android_Android_2.xml
+Android_2.jpg,720,1280,inputfield,104.0,906.0,513.0,44.0,Android_Android_2.xml
 Android_2.jpg,720,1280,text,100.0,1019.0,271.0,25.0,Android_Android_2.xml
 Android_2.jpg,720,1280,text,306.0,1205.0,107.0,29.0,Android_Android_2.xml
 Android_2.jpg,720,1280,textbutton,98.0,1072.0,525.0,85.0,Android_Android_2.xml
@@ -1767,16 +1738,16 @@ Android_340.jpg,720,1280,text,29.0,179.0,61.0,20.0,Android_Android_340.xml
 Android_340.jpg,720,1280,text,51.0,242.0,52.0,16.0,Android_Android_340.xml
 Android_340.jpg,720,1280,text,30.0,334.0,110.0,20.0,Android_Android_340.xml
 Android_340.jpg,720,1280,text,52.0,397.0,91.0,17.0,Android_Android_340.xml
-Android_340.jpg,720,1280,checkedtextview,28.0,485.0,348.0,43.0,Android_Android_340.xml
+Android_340.jpg,720,1280,checkedview,28.0,485.0,348.0,43.0,Android_Android_340.xml
 Android_340.jpg,720,1280,text,92.0,490.0,284.0,26.0,Android_Android_340.xml
 Android_340.jpg,720,1280,text,92.0,526.0,541.0,79.0,Android_Android_340.xml
-Android_340.jpg,720,1280,edittext,29.0,366.0,664.0,78.0,Android_Android_340.xml
-Android_340.jpg,720,1280,edittext,29.0,211.0,664.0,78.0,Android_Android_340.xml
+Android_340.jpg,720,1280,inputfield,29.0,366.0,664.0,78.0,Android_Android_340.xml
+Android_340.jpg,720,1280,inputfield,29.0,211.0,664.0,78.0,Android_Android_340.xml
 Android_181.jpg,720,1280,text,37.0,294.0,134.0,26.0,Android_Android_181.xml
 Android_181.jpg,720,1280,text,37.0,208.0,56.0,19.0,Android_Android_181.xml
 Android_181.jpg,720,1280,text,400.0,528.0,252.0,28.0,Android_Android_181.xml
-Android_181.jpg,720,1280,edittext,35.0,291.0,650.0,47.0,Android_Android_181.xml
-Android_181.jpg,720,1280,edittext,35.0,207.0,651.0,38.0,Android_Android_181.xml
+Android_181.jpg,720,1280,inputfield,35.0,291.0,650.0,47.0,Android_Android_181.xml
+Android_181.jpg,720,1280,inputfield,35.0,207.0,651.0,38.0,Android_Android_181.xml
 Android_181.jpg,720,1280,text,127.0,77.0,119.0,39.0,Android_Android_181.xml
 Android_181.jpg,720,1280,text,430.0,359.0,235.0,32.0,Android_Android_181.xml
 Android_181.jpg,720,1280,text,71.0,527.0,315.0,26.0,Android_Android_181.xml
@@ -1810,7 +1781,7 @@ Android_71.jpg,720,1280,icon,33.0,585.0,37.0,37.0,Android_Android_71.xml
 Android_71.jpg,720,1280,icon,39.0,518.0,28.0,33.0,Android_Android_71.xml
 Android_71.jpg,720,1280,icon,32.0,346.0,40.0,40.0,Android_Android_71.xml
 Android_71.jpg,720,1280,icon,481.0,105.0,99.0,82.0,Android_Android_71.xml
-Android_71.jpg,720,1280,drawer,1.0,43.0,607.0,1237.0,Android_Android_71.xml
+Android_71.jpg,720,1280,slidingmenu,1.0,43.0,607.0,1237.0,Android_Android_71.xml
 Android_71.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_71.xml
 Android_585.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,33.0,Android_Android_585.xml
 Android_585.jpg,720,1280,text,208.0,618.0,302.0,24.0,Android_Android_585.xml
@@ -1820,7 +1791,6 @@ Android_585.jpg,720,1280,pageindicator,325.0,1210.0,71.0,12.0,Android_Android_58
 Android_585.jpg,720,1280,image,341.0,716.0,40.0,37.0,Android_Android_585.xml
 Android_585.jpg,720,1280,text,271.0,960.0,180.0,38.0,Android_Android_585.xml
 Android_585.jpg,720,1280,text,108.0,809.0,504.0,96.0,Android_Android_585.xml
-Android_585.jpg,720,1280,modal,1.0,673.0,719.0,607.0,Android_Android_585.xml
 Android_546.jpg,720,1280,icon,613.0,1079.0,107.0,26.0,Android_Android_546.xml
 Android_546.jpg,720,1280,icon,316.0,1123.0,155.0,26.0,Android_Android_546.xml
 Android_546.jpg,720,1280,icon,19.0,1080.0,154.0,25.0,Android_Android_546.xml
@@ -1965,10 +1935,10 @@ Android_469.jpg,720,1280,icon,134.0,422.0,37.0,36.0,Android_Android_469.xml
 Android_469.jpg,720,1280,icon,136.0,515.0,33.0,23.0,Android_Android_469.xml
 Android_469.jpg,720,1280,icon,137.0,598.0,26.0,32.0,Android_Android_469.xml
 Android_469.jpg,720,1280,icon,137.0,683.0,31.0,35.0,Android_Android_469.xml
-Android_469.jpg,720,1280,edittext,177.0,412.0,406.0,59.0,Android_Android_469.xml
-Android_469.jpg,720,1280,edittext,178.0,512.0,404.0,45.0,Android_Android_469.xml
-Android_469.jpg,720,1280,edittext,179.0,599.0,403.0,45.0,Android_Android_469.xml
-Android_469.jpg,720,1280,edittext,178.0,685.0,404.0,46.0,Android_Android_469.xml
+Android_469.jpg,720,1280,inputfield,177.0,412.0,406.0,59.0,Android_Android_469.xml
+Android_469.jpg,720,1280,inputfield,178.0,512.0,404.0,45.0,Android_Android_469.xml
+Android_469.jpg,720,1280,inputfield,179.0,599.0,403.0,45.0,Android_Android_469.xml
+Android_469.jpg,720,1280,inputfield,178.0,685.0,404.0,46.0,Android_Android_469.xml
 Android_496.jpg,720,1280,image,19.0,1084.0,471.0,111.0,Android_Android_496.xml
 Android_496.jpg,720,1280,image,512.0,1085.0,208.0,110.0,Android_Android_496.xml
 Android_496.jpg,720,1280,text,624.0,1025.0,78.0,18.0,Android_Android_496.xml
@@ -2086,7 +2056,7 @@ Android_683.jpg,720,1280,text,34.0,1071.0,653.0,60.0,Android_Android_683.xml
 Android_683.jpg,720,1280,textbutton,29.0,942.0,664.0,78.0,Android_Android_683.xml
 Android_683.jpg,720,1280,text,349.0,892.0,24.0,15.0,Android_Android_683.xml
 Android_683.jpg,720,1280,textbutton,28.0,772.0,664.0,78.0,Android_Android_683.xml
-Android_683.jpg,720,1280,edittext,29.0,662.0,664.0,48.0,Android_Android_683.xml
+Android_683.jpg,720,1280,inputfield,29.0,662.0,664.0,48.0,Android_Android_683.xml
 Android_683.jpg,720,1280,text,30.0,617.0,53.0,17.0,Android_Android_683.xml
 Android_683.jpg,720,1280,text,107.0,461.0,507.0,90.0,Android_Android_683.xml
 Android_683.jpg,720,1280,text,105.0,308.0,510.0,93.0,Android_Android_683.xml
@@ -2098,8 +2068,8 @@ Android_456.jpg,720,1280,text,291.0,631.0,139.0,36.0,Android_Android_456.xml
 Android_456.jpg,720,1280,image,1.0,1.0,719.0,368.0,Android_Android_456.xml
 Android_456.jpg,720,1280,text,171.0,409.0,381.0,55.0,Android_Android_456.xml
 Android_456.jpg,720,1280,text,23.0,502.0,675.0,76.0,Android_Android_456.xml
-Android_456.jpg,720,1280,edittext,73.0,631.0,576.0,59.0,Android_Android_456.xml
-Android_456.jpg,720,1280,edittext,72.0,734.0,577.0,58.0,Android_Android_456.xml
+Android_456.jpg,720,1280,inputfield,73.0,631.0,576.0,59.0,Android_Android_456.xml
+Android_456.jpg,720,1280,inputfield,72.0,734.0,577.0,58.0,Android_Android_456.xml
 Android_456.jpg,720,1280,pageindicator,323.0,851.0,74.0,15.0,Android_Android_456.xml
 Android_456.jpg,720,1280,textbutton,254.0,922.0,211.0,89.0,Android_Android_456.xml
 Android_480.jpg,720,1280,image,22.0,1044.0,98.0,98.0,Android_Android_480.xml
@@ -2143,7 +2113,7 @@ Android_443.jpg,720,1280,textbutton,361.0,157.0,217.0,70.0,Android_Android_443.x
 Android_443.jpg,720,1280,textbutton,594.0,156.0,110.0,71.0,Android_Android_443.xml
 Android_443.jpg,720,1280,textbutton,19.0,157.0,325.0,70.0,Android_Android_443.xml
 Android_443.jpg,720,1280,icon,40.0,85.0,26.0,26.0,Android_Android_443.xml
-Android_443.jpg,720,1280,edittext,18.0,61.0,590.0,73.0,Android_Android_443.xml
+Android_443.jpg,720,1280,inputfield,18.0,61.0,590.0,73.0,Android_Android_443.xml
 Android_443.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_443.xml
 Android_457.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,33.0,Android_Android_457.xml
 Android_457.jpg,720,1280,icon,36.0,77.0,29.0,30.0,Android_Android_457.xml
@@ -2162,8 +2132,8 @@ Android_269.jpg,720,1280,backgroundimage,28.0,70.0,665.0,1182.0,Android_Android_
 Android_269.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_269.xml
 Android_241.jpg,720,1280,text,38.0,548.0,151.0,29.0,Android_Android_241.xml
 Android_241.jpg,720,1280,text,38.0,423.0,223.0,29.0,Android_Android_241.xml
-Android_241.jpg,720,1280,edittext,35.0,423.0,651.0,43.0,Android_Android_241.xml
-Android_241.jpg,720,1280,edittext,35.0,548.0,651.0,43.0,Android_Android_241.xml
+Android_241.jpg,720,1280,inputfield,35.0,423.0,651.0,43.0,Android_Android_241.xml
+Android_241.jpg,720,1280,inputfield,35.0,548.0,651.0,43.0,Android_Android_241.xml
 Android_241.jpg,720,1280,text,127.0,78.0,106.0,35.0,Android_Android_241.xml
 Android_241.jpg,720,1280,text,186.0,329.0,349.0,24.0,Android_Android_241.xml
 Android_241.jpg,720,1280,text,223.0,649.0,275.0,29.0,Android_Android_241.xml
@@ -2229,7 +2199,7 @@ Android_679.jpg,720,1280,text,213.0,232.0,296.0,32.0,Android_Android_679.xml
 Android_679.jpg,720,1280,text,257.0,183.0,208.0,32.0,Android_Android_679.xml
 Android_679.jpg,720,1280,icon,32.0,75.0,34.0,34.0,Android_Android_679.xml
 Android_679.jpg,720,1280,icon,658.0,76.0,26.0,34.0,Android_Android_679.xml
-Android_679.jpg,720,1280,edittext,15.0,57.0,691.0,70.0,Android_Android_679.xml
+Android_679.jpg,720,1280,inputfield,15.0,57.0,691.0,70.0,Android_Android_679.xml
 Android_679.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_679.xml
 Android_137.jpg,720,1280,text,128.0,81.0,173.0,27.0,Android_Android_137.xml
 Android_137.jpg,720,1280,text,303.0,166.0,115.0,29.0,Android_Android_137.xml
@@ -2280,7 +2250,7 @@ Android_645.jpg,720,1280,text,127.0,410.0,131.0,28.0,Android_Android_645.xml
 Android_645.jpg,720,1280,text,127.0,493.0,125.0,23.0,Android_Android_645.xml
 Android_645.jpg,720,1280,image,28.0,53.0,128.0,128.0,Android_Android_645.xml
 Android_645.jpg,720,1280,text,127.0,577.0,122.0,23.0,Android_Android_645.xml
-Android_645.jpg,720,1280,drawer,1.0,43.0,490.0,1237.0,Android_Android_645.xml
+Android_645.jpg,720,1280,slidingmenu,1.0,43.0,490.0,1237.0,Android_Android_645.xml
 Android_335.jpg,720,1280,text,128.0,76.0,202.0,30.0,Android_Android_335.xml
 Android_335.jpg,720,1280,text,31.0,543.0,314.0,46.0,Android_Android_335.xml
 Android_335.jpg,720,1280,text,29.0,627.0,646.0,130.0,Android_Android_335.xml
@@ -2331,7 +2301,7 @@ Android_485.jpg,720,1280,icon,517.0,672.0,9.0,21.0,Android_Android_485.xml
 Android_485.jpg,720,1280,icon,518.0,771.0,8.0,22.0,Android_Android_485.xml
 Android_485.jpg,720,1280,icon,517.0,841.0,9.0,22.0,Android_Android_485.xml
 Android_485.jpg,720,1280,icon,437.0,1160.0,81.0,81.0,Android_Android_485.xml
-Android_485.jpg,720,1280,drawer,1.0,43.0,551.0,1237.0,Android_Android_485.xml
+Android_485.jpg,720,1280,slidingmenu,1.0,43.0,551.0,1237.0,Android_Android_485.xml
 Android_452.jpg,720,1280,text,184.0,1186.0,409.0,38.0,Android_Android_452.xml
 Android_452.jpg,720,1280,icon,129.0,1181.0,37.0,37.0,Android_Android_452.xml
 Android_452.jpg,720,1280,textbutton,42.0,1056.0,637.0,78.0,Android_Android_452.xml
@@ -2372,7 +2342,7 @@ Android_650.jpg,720,1280,text,565.0,173.0,136.0,19.0,Android_Android_650.xml
 Android_650.jpg,720,1280,icon,654.0,71.0,34.0,40.0,Android_Android_650.xml
 Android_650.jpg,720,1280,icon,569.0,60.0,63.0,63.0,Android_Android_650.xml
 Android_650.jpg,720,1280,icon,43.0,78.0,28.0,28.0,Android_Android_650.xml
-Android_650.jpg,720,1280,edittext,14.0,57.0,538.0,70.0,Android_Android_650.xml
+Android_650.jpg,720,1280,inputfield,14.0,57.0,538.0,70.0,Android_Android_650.xml
 Android_650.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_650.xml
 Android_678.jpg,720,1280,icon,613.0,1037.0,107.0,25.0,Android_Android_678.xml
 Android_678.jpg,720,1280,icon,317.0,1037.0,154.0,25.0,Android_Android_678.xml
@@ -2464,7 +2434,7 @@ Android_518.jpg,720,1280,text,169.0,559.0,138.0,32.0,Android_Android_518.xml
 Android_518.jpg,720,1280,text,169.0,391.0,155.0,32.0,Android_Android_518.xml
 Android_518.jpg,720,1280,text,171.0,223.0,97.0,32.0,Android_Android_518.xml
 Android_518.jpg,720,1280,icon,68.0,82.0,32.0,33.0,Android_Android_518.xml
-Android_518.jpg,720,1280,edittext,29.0,56.0,664.0,85.0,Android_Android_518.xml
+Android_518.jpg,720,1280,inputfield,29.0,56.0,664.0,85.0,Android_Android_518.xml
 Android_518.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,34.0,Android_Android_518.xml
 Android_524.jpg,720,1280,text,122.0,802.0,215.0,33.0,Android_Android_524.xml
 Android_524.jpg,720,1280,text,122.0,686.0,309.0,33.0,Android_Android_524.xml
@@ -2474,8 +2444,8 @@ Android_524.jpg,720,1280,text,146.0,549.0,70.0,30.0,Android_Android_524.xml
 Android_524.jpg,720,1280,textbutton,360.0,499.0,360.0,121.0,Android_Android_524.xml
 Android_524.jpg,720,1280,textbutton,22.0,973.0,678.0,77.0,Android_Android_524.xml
 Android_524.jpg,720,1280,text,179.0,911.0,366.0,28.0,Android_Android_524.xml
-Android_524.jpg,720,1280,edittext,21.0,771.0,678.0,87.0,Android_Android_524.xml
-Android_524.jpg,720,1280,edittext,21.0,655.0,678.0,88.0,Android_Android_524.xml
+Android_524.jpg,720,1280,inputfield,21.0,771.0,678.0,87.0,Android_Android_524.xml
+Android_524.jpg,720,1280,inputfield,21.0,655.0,678.0,88.0,Android_Android_524.xml
 Android_524.jpg,720,1280,image,279.0,188.0,162.0,161.0,Android_Android_524.xml
 Android_524.jpg,720,1280,image,1.0,43.0,719.0,456.0,Android_Android_524.xml
 Android_524.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_524.xml
@@ -2520,8 +2490,8 @@ Android_646.jpg,720,1280,text,73.0,467.0,274.0,26.0,Android_Android_646.xml
 Android_646.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_646.xml
 Android_646.jpg,720,1280,text,177.0,233.0,371.0,74.0,Android_Android_646.xml
 Android_646.jpg,720,1280,text,82.0,335.0,557.0,38.0,Android_Android_646.xml
-Android_646.jpg,720,1280,edittext,70.0,468.0,581.0,35.0,Android_Android_646.xml
-Android_646.jpg,720,1280,edittext,70.0,566.0,521.0,33.0,Android_Android_646.xml
+Android_646.jpg,720,1280,inputfield,70.0,468.0,581.0,35.0,Android_Android_646.xml
+Android_646.jpg,720,1280,inputfield,70.0,566.0,521.0,33.0,Android_Android_646.xml
 Android_646.jpg,720,1280,icon,610.0,554.0,44.0,44.0,Android_Android_646.xml
 Android_646.jpg,720,1280,textbutton,50.0,639.0,622.0,78.0,Android_Android_646.xml
 Android_646.jpg,720,1280,text,340.0,741.0,39.0,21.0,Android_Android_646.xml
@@ -2533,15 +2503,15 @@ Android_336.jpg,720,1280,icon,41.0,78.0,17.0,29.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,28.0,179.0,278.0,42.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,424.0,185.0,271.0,26.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,27.0,248.0,605.0,29.0,Android_Android_336.xml
-Android_336.jpg,720,1280,edittext,27.0,315.0,667.0,79.0,Android_Android_336.xml
+Android_336.jpg,720,1280,inputfield,27.0,315.0,667.0,79.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,53.0,338.0,530.0,38.0,Android_Android_336.xml
-Android_336.jpg,720,1280,edittext,27.0,412.0,667.0,79.0,Android_Android_336.xml
+Android_336.jpg,720,1280,inputfield,27.0,412.0,667.0,79.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,54.0,438.0,82.0,28.0,Android_Android_336.xml
-Android_336.jpg,720,1280,edittext,27.0,509.0,667.0,79.0,Android_Android_336.xml
+Android_336.jpg,720,1280,inputfield,27.0,509.0,667.0,79.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,53.0,534.0,148.0,29.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,33.0,608.0,656.0,51.0,Android_Android_336.xml
 Android_336.jpg,720,1280,text,105.0,685.0,493.0,63.0,Android_Android_336.xml
-Android_336.jpg,720,1280,checkedtextview,25.0,684.0,574.0,64.0,Android_Android_336.xml
+Android_336.jpg,720,1280,checkedview,25.0,684.0,574.0,64.0,Android_Android_336.xml
 Android_336.jpg,720,1280,textbutton,27.0,767.0,668.0,99.0,Android_Android_336.xml
 Android_487.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,34.0,Android_Android_487.xml
 Android_487.jpg,720,1280,icon,26.0,60.0,34.0,31.0,Android_Android_487.xml
@@ -2598,7 +2568,7 @@ Android_690.jpg,720,1280,text,213.0,233.0,296.0,31.0,Android_Android_690.xml
 Android_690.jpg,720,1280,text,258.0,185.0,206.0,30.0,Android_Android_690.xml
 Android_690.jpg,720,1280,icon,31.0,75.0,35.0,34.0,Android_Android_690.xml
 Android_690.jpg,720,1280,icon,658.0,76.0,26.0,34.0,Android_Android_690.xml
-Android_690.jpg,720,1280,edittext,14.0,57.0,692.0,70.0,Android_Android_690.xml
+Android_690.jpg,720,1280,inputfield,14.0,57.0,692.0,70.0,Android_Android_690.xml
 Android_690.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_690.xml
 Android_109.jpg,720,1280,text,106.0,80.0,108.0,26.0,Android_Android_109.xml
 Android_109.jpg,720,1280,icon,382.0,73.0,28.0,37.0,Android_Android_109.xml
@@ -2625,7 +2595,7 @@ Android_109.jpg,720,1280,textbutton,139.0,513.0,135.0,85.0,Android_Android_109.x
 Android_109.jpg,720,1280,textbutton,293.0,513.0,135.0,85.0,Android_Android_109.xml
 Android_109.jpg,720,1280,textbutton,447.0,513.0,135.0,85.0,Android_Android_109.xml
 Android_109.jpg,720,1280,image,33.0,632.0,655.0,550.0,Android_Android_109.xml
-Android_109.jpg,720,1280,edittext,29.0,57.0,663.0,70.0,Android_Android_109.xml
+Android_109.jpg,720,1280,inputfield,29.0,57.0,663.0,70.0,Android_Android_109.xml
 Android_109.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_109.xml
 Android_12.jpg,720,1280,text,37.0,646.0,220.0,22.0,Android_Android_12.xml
 Android_12.jpg,720,1280,text,38.0,501.0,117.0,23.0,Android_Android_12.xml
@@ -2640,9 +2610,9 @@ Android_12.jpg,720,1280,textbutton,29.0,843.0,663.0,84.0,Android_Android_12.xml
 Android_12.jpg,720,1280,textbutton,28.0,733.0,664.0,85.0,Android_Android_12.xml
 Android_12.jpg,720,1280,icon,630.0,498.0,40.0,35.0,Android_Android_12.xml
 Android_12.jpg,720,1280,icon,630.0,642.0,40.0,35.0,Android_Android_12.xml
-Android_12.jpg,720,1280,edittext,35.0,363.0,650.0,38.0,Android_Android_12.xml
-Android_12.jpg,720,1280,edittext,35.0,498.0,650.0,46.0,Android_Android_12.xml
-Android_12.jpg,720,1280,edittext,35.0,642.0,650.0,46.0,Android_Android_12.xml
+Android_12.jpg,720,1280,inputfield,35.0,363.0,650.0,38.0,Android_Android_12.xml
+Android_12.jpg,720,1280,inputfield,35.0,498.0,650.0,46.0,Android_Android_12.xml
+Android_12.jpg,720,1280,inputfield,35.0,642.0,650.0,46.0,Android_Android_12.xml
 Android_294.jpg,720,1280,image,213.0,348.0,295.0,292.0,Android_Android_294.xml
 Android_294.jpg,720,1280,text,19.0,77.0,89.0,29.0,Android_Android_294.xml
 Android_294.jpg,720,1280,icon,589.0,75.0,36.0,34.0,Android_Android_294.xml
@@ -2671,15 +2641,15 @@ Android_525.jpg,720,1280,text,31.0,681.0,190.0,19.0,Android_Android_525.xml
 Android_525.jpg,720,1280,icon,196.0,747.0,17.0,10.0,Android_Android_525.xml
 Android_525.jpg,720,1280,text,132.0,739.0,51.0,27.0,Android_Android_525.xml
 Android_525.jpg,720,1280,image,44.0,729.0,44.0,44.0,Android_Android_525.xml
-Android_525.jpg,720,1280,edittext,246.0,741.0,439.0,38.0,Android_Android_525.xml
-Android_525.jpg,720,1280,edittext,28.0,521.0,664.0,41.0,Android_Android_525.xml
-Android_525.jpg,720,1280,edittext,28.0,401.0,664.0,41.0,Android_Android_525.xml
+Android_525.jpg,720,1280,inputfield,246.0,741.0,439.0,38.0,Android_Android_525.xml
+Android_525.jpg,720,1280,inputfield,28.0,521.0,664.0,41.0,Android_Android_525.xml
+Android_525.jpg,720,1280,inputfield,28.0,401.0,664.0,41.0,Android_Android_525.xml
 Android_525.jpg,720,1280,text,28.0,228.0,581.0,80.0,Android_Android_525.xml
 Android_525.jpg,720,1280,icon,33.0,80.0,34.0,25.0,Android_Android_525.xml
 Android_525.jpg,720,1280,text,216.0,80.0,288.0,30.0,Android_Android_525.xml
 Android_525.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,41.0,Android_Android_525.xml
 Android_299.jpg,720,1280,text,106.0,535.0,293.0,27.0,Android_Android_299.xml
-Android_299.jpg,720,1280,edittext,82.0,516.0,557.0,61.0,Android_Android_299.xml
+Android_299.jpg,720,1280,inputfield,82.0,516.0,557.0,61.0,Android_Android_299.xml
 Android_299.jpg,720,1280,image,156.0,245.0,414.0,162.0,Android_Android_299.xml
 Android_299.jpg,720,1280,text,127.0,77.0,378.0,36.0,Android_Android_299.xml
 Android_299.jpg,720,1280,icon,35.0,78.0,29.0,28.0,Android_Android_299.xml
@@ -2760,7 +2730,7 @@ Android_488.jpg,720,1280,image,374.0,606.0,318.0,239.0,Android_Android_488.xml
 Android_488.jpg,720,1280,image,29.0,608.0,318.0,237.0,Android_Android_488.xml
 Android_488.jpg,720,1280,image,29.0,1058.0,318.0,222.0,Android_Android_488.xml
 Android_488.jpg,720,1280,image,375.0,154.0,318.0,239.0,Android_Android_488.xml
-Android_488.jpg,720,1280,edittext,15.0,57.0,691.0,70.0,Android_Android_488.xml
+Android_488.jpg,720,1280,inputfield,15.0,57.0,691.0,70.0,Android_Android_488.xml
 Android_488.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_488.xml
 Android_35.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_35.xml
 Android_35.jpg,720,1280,text,661.0,70.0,41.0,22.0,Android_Android_35.xml
@@ -2768,10 +2738,10 @@ Android_35.jpg,720,1280,image,180.0,138.0,362.0,362.0,Android_Android_35.xml
 Android_35.jpg,720,1280,text,123.0,602.0,476.0,21.0,Android_Android_35.xml
 Android_35.jpg,720,1280,pageindicator,331.0,645.0,79.0,16.0,Android_Android_35.xml
 Android_35.jpg,720,1280,text,110.0,796.0,503.0,25.0,Android_Android_35.xml
-Android_35.jpg,720,1280,edittext,49.0,843.0,622.0,85.0,Android_Android_35.xml
+Android_35.jpg,720,1280,inputfield,49.0,843.0,622.0,85.0,Android_Android_35.xml
 Android_35.jpg,720,1280,text,225.0,875.0,273.0,22.0,Android_Android_35.xml
 Android_35.jpg,720,1280,text,248.0,974.0,226.0,20.0,Android_Android_35.xml
-Android_35.jpg,720,1280,checkedtextview,61.0,1120.0,322.0,34.0,Android_Android_35.xml
+Android_35.jpg,720,1280,checkedview,61.0,1120.0,322.0,34.0,Android_Android_35.xml
 Android_35.jpg,720,1280,text,111.0,1128.0,272.0,22.0,Android_Android_35.xml
 Android_35.jpg,720,1280,textbutton,1.0,1182.0,719.0,98.0,Android_Android_35.xml
 Android_728.jpg,720,1280,text,36.0,1103.0,206.0,26.0,Android_Android_728.xml
@@ -2788,7 +2758,7 @@ Android_728.jpg,720,1280,text,35.0,270.0,213.0,31.0,Android_Android_728.xml
 Android_728.jpg,720,1280,text,38.0,186.0,159.0,26.0,Android_Android_728.xml
 Android_728.jpg,720,1280,text,102.0,81.0,307.0,31.0,Android_Android_728.xml
 Android_728.jpg,720,1280,icon,31.0,65.0,53.0,53.0,Android_Android_728.xml
-Android_728.jpg,720,1280,drawer,1.0,43.0,607.0,1237.0,Android_Android_728.xml
+Android_728.jpg,720,1280,slidingmenu,1.0,43.0,607.0,1237.0,Android_Android_728.xml
 Android_728.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_728.xml
 Android_502.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_502.xml
 Android_502.jpg,720,1280,icon,117.0,782.0,14.0,10.0,Android_Android_502.xml
@@ -2804,12 +2774,12 @@ Android_502.jpg,720,1280,text,81.0,779.0,26.0,19.0,Android_Android_502.xml
 Android_502.jpg,720,1280,text,324.0,894.0,74.0,24.0,Android_Android_502.xml
 Android_502.jpg,720,1280,text,79.0,987.0,71.0,23.0,Android_Android_502.xml
 Android_502.jpg,720,1280,text,119.0,1095.0,425.0,28.0,Android_Android_502.xml
-Android_502.jpg,720,1280,checkedtextview,56.0,1084.0,488.0,44.0,Android_Android_502.xml
+Android_502.jpg,720,1280,checkedview,56.0,1084.0,488.0,44.0,Android_Android_502.xml
 Android_502.jpg,720,1280,textbutton,56.0,1179.0,608.0,96.0,Android_Android_502.xml
-Android_502.jpg,720,1280,edittext,57.0,316.0,607.0,105.0,Android_Android_502.xml
-Android_502.jpg,720,1280,edittext,57.0,945.0,607.0,105.0,Android_Android_502.xml
-Android_502.jpg,720,1280,edittext,57.0,735.0,607.0,105.0,Android_Android_502.xml
-Android_502.jpg,720,1280,edittext,57.0,526.0,607.0,105.0,Android_Android_502.xml
+Android_502.jpg,720,1280,inputfield,57.0,316.0,607.0,105.0,Android_Android_502.xml
+Android_502.jpg,720,1280,inputfield,57.0,945.0,607.0,105.0,Android_Android_502.xml
+Android_502.jpg,720,1280,inputfield,57.0,735.0,607.0,105.0,Android_Android_502.xml
+Android_502.jpg,720,1280,inputfield,57.0,526.0,607.0,105.0,Android_Android_502.xml
 Android_31.jpg,720,1280,text,624.0,82.0,82.0,21.0,Android_Android_31.xml
 Android_31.jpg,720,1280,text,400.0,176.0,121.0,29.0,Android_Android_31.xml
 Android_31.jpg,720,1280,text,374.0,226.0,294.0,55.0,Android_Android_31.xml
@@ -2958,7 +2928,7 @@ Android_114.jpg,720,1280,textbutton,42.0,822.0,636.0,92.0,Android_Android_114.xm
 Android_114.jpg,720,1280,textbutton,43.0,934.0,635.0,92.0,Android_Android_114.xml
 Android_114.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_114.xml
 Android_27.jpg,720,1280,text,45.0,462.0,220.0,26.0,Android_Android_27.xml
-Android_27.jpg,720,1280,edittext,28.0,404.0,665.0,106.0,Android_Android_27.xml
+Android_27.jpg,720,1280,inputfield,28.0,404.0,665.0,106.0,Android_Android_27.xml
 Android_27.jpg,720,1280,text,99.0,80.0,86.0,29.0,Android_Android_27.xml
 Android_27.jpg,720,1280,image,88.0,169.0,545.0,115.0,Android_Android_27.xml
 Android_27.jpg,720,1280,text,100.0,314.0,525.0,56.0,Android_Android_27.xml
@@ -3010,7 +2980,7 @@ Android_262.jpg,720,1280,image,50.0,443.0,41.0,44.0,Android_Android_262.xml
 Android_262.jpg,720,1280,image,42.0,332.0,57.0,52.0,Android_Android_262.xml
 Android_262.jpg,720,1280,image,40.0,227.0,62.0,47.0,Android_Android_262.xml
 Android_262.jpg,720,1280,icon,62.0,127.0,33.0,33.0,Android_Android_262.xml
-Android_262.jpg,720,1280,edittext,28.0,94.0,665.0,100.0,Android_Android_262.xml
+Android_262.jpg,720,1280,inputfield,28.0,94.0,665.0,100.0,Android_Android_262.xml
 Android_262.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_262.xml
 Android_510.jpg,720,1280,text,86.0,80.0,287.0,31.0,Android_Android_510.xml
 Android_510.jpg,720,1280,text,44.0,949.0,234.0,28.0,Android_Android_510.xml
@@ -3047,7 +3017,7 @@ Android_510.jpg,720,1280,image,374.0,610.0,318.0,238.0,Android_Android_510.xml
 Android_510.jpg,720,1280,image,374.0,1062.0,319.0,218.0,Android_Android_510.xml
 Android_510.jpg,720,1280,image,28.0,1062.0,320.0,218.0,Android_Android_510.xml
 Android_510.jpg,720,1280,image,375.0,158.0,319.0,239.0,Android_Android_510.xml
-Android_510.jpg,720,1280,edittext,15.0,56.0,692.0,71.0,Android_Android_510.xml
+Android_510.jpg,720,1280,inputfield,15.0,56.0,692.0,71.0,Android_Android_510.xml
 Android_510.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_510.xml
 Android_211.jpg,720,1280,text,47.0,553.0,104.0,18.0,Android_Android_211.xml
 Android_211.jpg,720,1280,text,47.0,465.0,56.0,18.0,Android_Android_211.xml
@@ -3062,17 +3032,17 @@ Android_211.jpg,720,1280,textbutton,29.0,892.0,663.0,72.0,Android_Android_211.xm
 Android_211.jpg,720,1280,textbutton,367.0,809.0,325.0,71.0,Android_Android_211.xml
 Android_211.jpg,720,1280,textbutton,29.0,810.0,325.0,70.0,Android_Android_211.xml
 Android_211.jpg,720,1280,textbutton,29.0,671.0,663.0,70.0,Android_Android_211.xml
-Android_211.jpg,720,1280,edittext,28.0,438.0,664.0,71.0,Android_Android_211.xml
-Android_211.jpg,720,1280,edittext,28.0,526.0,664.0,71.0,Android_Android_211.xml
+Android_211.jpg,720,1280,inputfield,28.0,438.0,664.0,71.0,Android_Android_211.xml
+Android_211.jpg,720,1280,inputfield,28.0,526.0,664.0,71.0,Android_Android_211.xml
 Android_211.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_211.xml
 Android_239.jpg,720,1280,text,37.0,666.0,134.0,25.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,271.0,552.0,226.0,28.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,38.0,456.0,190.0,24.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,384.0,355.0,140.0,23.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,37.0,357.0,108.0,17.0,Android_Android_239.xml
-Android_239.jpg,720,1280,edittext,36.0,456.0,650.0,38.0,Android_Android_239.xml
-Android_239.jpg,720,1280,edittext,381.0,355.0,305.0,37.0,Android_Android_239.xml
-Android_239.jpg,720,1280,edittext,35.0,357.0,305.0,37.0,Android_Android_239.xml
+Android_239.jpg,720,1280,inputfield,36.0,456.0,650.0,38.0,Android_Android_239.xml
+Android_239.jpg,720,1280,inputfield,381.0,355.0,305.0,37.0,Android_Android_239.xml
+Android_239.jpg,720,1280,inputfield,35.0,357.0,305.0,37.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,29.0,230.0,432.0,45.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,36.0,509.0,81.0,24.0,Android_Android_239.xml
 Android_239.jpg,720,1280,text,43.0,554.0,102.0,34.0,Android_Android_239.xml
@@ -3080,8 +3050,8 @@ Android_239.jpg,720,1280,textbutton,36.0,1157.0,650.0,86.0,Android_Android_239.x
 Android_239.jpg,720,1280,icon,630.0,663.0,40.0,35.0,Android_Android_239.xml
 Android_239.jpg,720,1280,icon,212.0,564.0,17.0,10.0,Android_Android_239.xml
 Android_239.jpg,720,1280,image,48.0,133.0,75.0,44.0,Android_Android_239.xml
-Android_239.jpg,720,1280,edittext,36.0,662.0,650.0,47.0,Android_Android_239.xml
-Android_239.jpg,720,1280,edittext,270.0,552.0,416.0,46.0,Android_Android_239.xml
+Android_239.jpg,720,1280,inputfield,36.0,662.0,650.0,47.0,Android_Android_239.xml
+Android_239.jpg,720,1280,inputfield,270.0,552.0,416.0,46.0,Android_Android_239.xml
 Android_239.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_239.xml
 Android_588.jpg,720,1280,text,45.0,565.0,112.0,20.0,Android_Android_588.xml
 Android_588.jpg,720,1280,text,45.0,446.0,167.0,20.0,Android_Android_588.xml
@@ -3089,8 +3059,8 @@ Android_588.jpg,720,1280,textbutton,29.0,1006.0,663.0,90.0,Android_Android_588.x
 Android_588.jpg,720,1280,text,188.0,938.0,346.0,24.0,Android_Android_588.xml
 Android_588.jpg,720,1280,text,256.0,844.0,211.0,25.0,Android_Android_588.xml
 Android_588.jpg,720,1280,textbutton,29.0,697.0,663.0,90.0,Android_Android_588.xml
-Android_588.jpg,720,1280,edittext,29.0,541.0,663.0,73.0,Android_Android_588.xml
-Android_588.jpg,720,1280,edittext,29.0,421.0,663.0,74.0,Android_Android_588.xml
+Android_588.jpg,720,1280,inputfield,29.0,541.0,663.0,73.0,Android_Android_588.xml
+Android_588.jpg,720,1280,inputfield,29.0,421.0,663.0,74.0,Android_Android_588.xml
 Android_588.jpg,720,1280,text,37.0,509.0,118.0,18.0,Android_Android_588.xml
 Android_588.jpg,720,1280,text,37.0,389.0,66.0,18.0,Android_Android_588.xml
 Android_588.jpg,720,1280,text,308.0,159.0,106.0,32.0,Android_Android_588.xml
@@ -3185,7 +3155,7 @@ Android_212.jpg,720,1280,icon,628.0,1200.0,41.0,34.0,Android_Android_212.xml
 Android_212.jpg,720,1280,icon,641.0,87.0,19.0,10.0,Android_Android_212.xml
 Android_212.jpg,720,1280,icon,381.0,72.0,29.0,38.0,Android_Android_212.xml
 Android_212.jpg,720,1280,icon,48.0,74.0,37.0,37.0,Android_Android_212.xml
-Android_212.jpg,720,1280,edittext,28.0,56.0,664.0,71.0,Android_Android_212.xml
+Android_212.jpg,720,1280,inputfield,28.0,56.0,664.0,71.0,Android_Android_212.xml
 Android_212.jpg,720,1280,image,319.0,225.0,401.0,299.0,Android_Android_212.xml
 Android_212.jpg,720,1280,image,1.0,523.0,368.0,346.0,Android_Android_212.xml
 Android_212.jpg,720,1280,image,1.0,869.0,405.0,313.0,Android_Android_212.xml
@@ -3263,7 +3233,7 @@ Android_429.jpg,720,1280,text,213.0,233.0,296.0,32.0,Android_Android_429.xml
 Android_429.jpg,720,1280,text,315.0,183.0,90.0,26.0,Android_Android_429.xml
 Android_429.jpg,720,1280,icon,32.0,75.0,34.0,34.0,Android_Android_429.xml
 Android_429.jpg,720,1280,icon,658.0,76.0,26.0,34.0,Android_Android_429.xml
-Android_429.jpg,720,1280,edittext,14.0,56.0,692.0,71.0,Android_Android_429.xml
+Android_429.jpg,720,1280,inputfield,14.0,56.0,692.0,71.0,Android_Android_429.xml
 Android_429.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_429.xml
 Android_401.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,35.0,Android_Android_401.xml
 Android_401.jpg,720,1280,text,292.0,76.0,139.0,19.0,Android_Android_401.xml
@@ -3375,7 +3345,7 @@ Android_389.jpg,720,1280,icon,630.0,1213.0,36.0,37.0,Android_Android_389.xml
 Android_376.jpg,720,1280,text,221.0,66.0,246.0,29.0,Android_Android_376.xml
 Android_376.jpg,720,1280,icon,61.0,65.0,28.0,28.0,Android_Android_376.xml
 Android_376.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,34.0,Android_Android_376.xml
-Android_376.jpg,720,1280,edittext,28.0,42.0,664.0,86.0,Android_Android_376.xml
+Android_376.jpg,720,1280,inputfield,28.0,42.0,664.0,86.0,Android_Android_376.xml
 Android_376.jpg,720,1280,text,200.0,184.0,324.0,35.0,Android_Android_376.xml
 Android_376.jpg,720,1280,image,35.0,241.0,194.0,203.0,Android_Android_376.xml
 Android_376.jpg,720,1280,image,264.0,241.0,194.0,203.0,Android_Android_376.xml
@@ -3478,7 +3448,7 @@ Android_611.jpg,720,1280,textbutton,595.0,157.0,109.0,70.0,Android_Android_611.x
 Android_611.jpg,720,1280,textbutton,361.0,157.0,217.0,70.0,Android_Android_611.xml
 Android_611.jpg,720,1280,textbutton,19.0,157.0,325.0,70.0,Android_Android_611.xml
 Android_611.jpg,720,1280,icon,40.0,85.0,26.0,26.0,Android_Android_611.xml
-Android_611.jpg,720,1280,edittext,19.0,61.0,589.0,73.0,Android_Android_611.xml
+Android_611.jpg,720,1280,inputfield,19.0,61.0,589.0,73.0,Android_Android_611.xml
 Android_611.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_611.xml
 Android_639.jpg,720,1280,text,28.0,441.0,422.0,91.0,Android_Android_639.xml
 Android_639.jpg,720,1280,text,30.0,1024.0,452.0,95.0,Android_Android_639.xml
@@ -3530,7 +3500,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 38452.jpg,540,897,text,67.0,300.0,392.0,53.0,Rico_38452.xml
 38452.jpg,540,897,text,114.0,237.0,285.0,19.0,Rico_38452.xml
 38452.jpg,540,897,text,67.0,175.0,223.0,20.0,Rico_38452.xml
-38452.jpg,540,897,modal,35.0,52.0,471.0,825.0,Rico_38452.xml
 38452.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_38452.xml
 36457.jpg,1080,1794,text,378.0,1317.0,346.0,54.0,Rico_36457.xml
 36457.jpg,1080,1794,pageindicator,459.0,1711.0,150.0,32.0,Rico_36457.xml
@@ -3544,7 +3513,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 15503.jpg,540,897,image,184.0,328.0,173.0,153.0,Rico_15503.xml
 15503.jpg,540,897,text,49.0,239.0,119.0,22.0,Rico_15503.xml
 15503.jpg,540,897,icon,480.0,235.0,9.0,25.0,Rico_15503.xml
-15503.jpg,540,897,modal,26.0,210.0,489.0,541.0,Rico_15503.xml
 15503.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_15503.xml
 23304.jpg,1080,1794,image,451.0,619.0,179.0,190.0,Rico_23304.xml
 23304.jpg,1080,1794,text,157.0,838.0,764.0,47.0,Rico_23304.xml
@@ -3572,7 +3540,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 62370.jpg,540,897,icon,25.0,122.0,25.0,25.0,Rico_62370.xml
 62370.jpg,540,897,text,95.0,54.0,136.0,21.0,Rico_62370.xml
 62370.jpg,540,897,icon,27.0,53.0,21.0,22.0,Rico_62370.xml
-62370.jpg,540,897,toolbar,1.0,33.0,539.0,63.0,Rico_62370.xml
 62370.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_62370.xml
 59682.jpg,1080,1794,icon,863.0,1576.0,149.0,150.0,Rico_59682.xml
 59682.jpg,1080,1794,icon,895.0,108.0,34.0,59.0,Rico_59682.xml
@@ -3595,8 +3562,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 59682.jpg,1080,1794,image,66.0,836.0,54.0,77.0,Rico_59682.xml
 59682.jpg,1080,1794,icon,56.0,959.0,74.0,74.0,Rico_59682.xml
 59682.jpg,1080,1794,icon,61.0,1082.0,64.0,69.0,Rico_59682.xml
-59682.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_59682.xml
-59682.jpg,1080,1794,drawer,1.0,211.0,630.0,1583.0,Rico_59682.xml
+59682.jpg,1080,1794,slidingmenu,1.0,211.0,630.0,1583.0,Rico_59682.xml
 59682.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_59682.xml
 63286.jpg,1080,1794,text,231.0,150.0,615.0,150.0,Rico_63286.xml
 63286.jpg,1080,1794,icon,997.0,176.0,44.0,67.0,Rico_63286.xml
@@ -3636,7 +3602,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 54589.jpg,1080,1794,text,202.0,1187.0,677.0,198.0,Rico_54589.xml
 54589.jpg,1080,1794,pageindicator,483.0,1452.0,116.0,24.0,Rico_54589.xml
 54589.jpg,1080,1794,textbutton,57.0,1544.0,967.0,189.0,Rico_54589.xml
-54589.jpg,1080,1794,card,56.0,123.0,968.0,1610.0,Rico_54589.xml
 54589.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,62.0,Rico_54589.xml
 34519.jpg,1080,1794,text,130.0,1342.0,87.0,25.0,Rico_34519.xml
 34519.jpg,1080,1794,icon,957.0,103.0,63.0,69.0,Rico_34519.xml
@@ -3645,7 +3610,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 34519.jpg,1080,1794,icon,48.0,120.0,51.0,35.0,Rico_34519.xml
 34519.jpg,1080,1794,textbutton,541.0,1034.0,426.0,147.0,Rico_34519.xml
 34519.jpg,1080,1794,textbutton,114.0,1452.0,853.0,126.0,Rico_34519.xml
-34519.jpg,1080,1794,edittext,113.0,1281.0,854.0,146.0,Rico_34519.xml
+34519.jpg,1080,1794,inputfield,113.0,1281.0,854.0,146.0,Rico_34519.xml
 34519.jpg,1080,1794,text,115.0,1218.0,152.0,34.0,Rico_34519.xml
 34519.jpg,1080,1794,textbutton,114.0,1034.0,428.0,147.0,Rico_34519.xml
 34519.jpg,1080,1794,text,117.0,973.0,67.0,27.0,Rico_34519.xml
@@ -3653,7 +3618,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 34519.jpg,1080,1794,text,202.0,715.0,674.0,48.0,Rico_34519.xml
 34519.jpg,1080,1794,image,246.0,373.0,594.0,296.0,Rico_34519.xml
 34519.jpg,1080,1794,text,914.0,253.0,78.0,42.0,Rico_34519.xml
-34519.jpg,1080,1794,modal,48.0,200.0,984.0,1458.0,Rico_34519.xml
 34519.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_34519.xml
 38445.jpg,540,897,image,11.0,698.0,519.0,183.0,Rico_38445.xml
 38445.jpg,540,897,text,11.0,636.0,280.0,16.0,Rico_38445.xml
@@ -3683,7 +3647,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 65965.jpg,1080,1794,text,43.0,406.0,136.0,38.0,Rico_65965.xml
 65965.jpg,1080,1794,image,214.0,133.0,370.0,69.0,Rico_65965.xml
 65965.jpg,1080,1794,image,1.0,60.0,796.0,277.0,Rico_65965.xml
-65965.jpg,1080,1794,drawer,1.0,60.0,798.0,1734.0,Rico_65965.xml
+65965.jpg,1080,1794,slidingmenu,1.0,60.0,798.0,1734.0,Rico_65965.xml
 65965.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_65965.xml
 13415.jpg,540,897,image,1.0,33.0,539.0,621.0,Rico_13415.xml
 13415.jpg,540,897,text,146.0,685.0,250.0,23.0,Rico_13415.xml
@@ -3727,8 +3691,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 27954.jpg,1080,1794,text,28.0,370.0,97.0,30.0,Rico_27954.xml
 27954.jpg,1080,1794,image,213.0,109.0,328.0,58.0,Rico_27954.xml
 27954.jpg,1080,1794,icon,50.0,114.0,45.0,44.0,Rico_27954.xml
-27954.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_27954.xml
-27954.jpg,1080,1794,drawer,1.0,211.0,630.0,1583.0,Rico_27954.xml
+27954.jpg,1080,1794,slidingmenu,1.0,211.0,630.0,1583.0,Rico_27954.xml
 27954.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_27954.xml
 60558.jpg,1080,1794,image,95.0,546.0,891.0,785.0,Rico_60558.xml
 60558.jpg,1080,1794,text,65.0,186.0,519.0,47.0,Rico_60558.xml
@@ -3756,28 +3719,27 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 54831.jpg,1080,1794,image,41.0,297.0,197.0,203.0,Rico_54831.xml
 54831.jpg,1080,1794,text,379.0,43.0,324.0,54.0,Rico_54831.xml
 54831.jpg,1080,1794,icon,45.0,36.0,32.0,55.0,Rico_54831.xml
-54831.jpg,1080,1794,toolbar,3.0,1.0,1077.0,124.0,Rico_54831.xml
 16814.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_16814.xml
 16814.jpg,540,897,text,326.0,56.0,159.0,16.0,Rico_16814.xml
 16814.jpg,540,897,text,53.0,57.0,165.0,16.0,Rico_16814.xml
 16814.jpg,540,897,icon,57.0,146.0,24.0,25.0,Rico_16814.xml
 16814.jpg,540,897,text,102.0,150.0,46.0,17.0,Rico_16814.xml
 16814.jpg,540,897,text,27.0,254.0,73.0,16.0,Rico_16814.xml
-16814.jpg,540,897,checkedtextview,28.0,300.0,478.0,27.0,Rico_16814.xml
+16814.jpg,540,897,checkedview,28.0,300.0,478.0,27.0,Rico_16814.xml
 16814.jpg,540,897,text,28.0,305.0,221.0,22.0,Rico_16814.xml
 16814.jpg,540,897,text,27.0,386.0,63.0,17.0,Rico_16814.xml
-16814.jpg,540,897,checkedtextview,26.0,433.0,479.0,26.0,Rico_16814.xml
+16814.jpg,540,897,checkedview,26.0,433.0,479.0,26.0,Rico_16814.xml
 16814.jpg,540,897,text,26.0,437.0,94.0,19.0,Rico_16814.xml
 16814.jpg,540,897,text,27.0,519.0,78.0,17.0,Rico_16814.xml
-16814.jpg,540,897,checkedtextview,27.0,565.0,479.0,26.0,Rico_16814.xml
+16814.jpg,540,897,checkedview,27.0,565.0,479.0,26.0,Rico_16814.xml
 16814.jpg,540,897,text,27.0,569.0,178.0,19.0,Rico_16814.xml
 16814.jpg,540,897,text,27.0,651.0,79.0,17.0,Rico_16814.xml
-16814.jpg,540,897,checkedtextview,26.0,698.0,480.0,26.0,Rico_16814.xml
+16814.jpg,540,897,checkedview,26.0,698.0,480.0,26.0,Rico_16814.xml
 16814.jpg,540,897,text,26.0,701.0,223.0,22.0,Rico_16814.xml
-16814.jpg,540,897,checkedtextview,26.0,765.0,480.0,26.0,Rico_16814.xml
+16814.jpg,540,897,checkedview,26.0,765.0,480.0,26.0,Rico_16814.xml
 16814.jpg,540,897,text,26.0,769.0,145.0,19.0,Rico_16814.xml
 16814.jpg,540,897,text,456.0,852.0,53.0,19.0,Rico_16814.xml
-16814.jpg,540,897,edittext,25.0,124.0,490.0,70.0,Rico_16814.xml
+16814.jpg,540,897,inputfield,25.0,124.0,490.0,70.0,Rico_16814.xml
 16814.jpg,540,897,pageindicator,211.0,853.0,119.0,15.0,Rico_16814.xml
 41025.jpg,1080,1794,text,168.0,1726.0,186.0,31.0,Rico_41025.xml
 41025.jpg,1080,1794,image,37.0,1665.0,95.0,95.0,Rico_41025.xml
@@ -3811,7 +3773,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 41025.jpg,1080,1794,text,158.0,117.0,278.0,44.0,Rico_41025.xml
 41025.jpg,1080,1794,icon,989.0,113.0,48.0,48.0,Rico_41025.xml
 41025.jpg,1080,1794,icon,48.0,119.0,52.0,37.0,Rico_41025.xml
-41025.jpg,1080,1794,toolbar,1.0,65.0,1079.0,147.0,Rico_41025.xml
 41025.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_41025.xml
 12326.jpg,540,897,text,378.0,123.0,121.0,17.0,Rico_12326.xml
 12326.jpg,540,897,text,209.0,123.0,88.0,17.0,Rico_12326.xml
@@ -3843,13 +3804,12 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 26256.jpg,1080,1794,icon,110.0,1034.0,62.0,62.0,Rico_26256.xml
 26256.jpg,1080,1794,image,103.0,1168.0,76.0,77.0,Rico_26256.xml
 26256.jpg,1080,1794,text,133.0,494.0,413.0,41.0,Rico_26256.xml
-26256.jpg,1080,1794,modal,69.0,433.0,943.0,993.0,Rico_26256.xml
 26256.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_26256.xml
 40689.jpg,1080,1794,text,76.0,568.0,141.0,26.0,Rico_40689.xml
 40689.jpg,1080,1794,text,76.0,791.0,204.0,39.0,Rico_40689.xml
 40689.jpg,1080,1794,textbutton,63.0,909.0,955.0,127.0,Rico_40689.xml
-40689.jpg,1080,1794,edittext,73.0,791.0,935.0,63.0,Rico_40689.xml
-40689.jpg,1080,1794,edittext,73.0,567.0,935.0,126.0,Rico_40689.xml
+40689.jpg,1080,1794,inputfield,73.0,791.0,935.0,63.0,Rico_40689.xml
+40689.jpg,1080,1794,inputfield,73.0,567.0,935.0,126.0,Rico_40689.xml
 40689.jpg,1080,1794,image,430.0,155.0,221.0,264.0,Rico_40689.xml
 40689.jpg,1080,1794,text,287.0,472.0,507.0,56.0,Rico_40689.xml
 40689.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_40689.xml
@@ -3873,7 +3833,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 11203.jpg,1080,1794,text,279.0,541.0,549.0,103.0,Rico_11203.xml
 11203.jpg,1080,1794,image,140.0,531.0,112.0,111.0,Rico_11203.xml
 11203.jpg,1080,1794,image,434.0,269.0,215.0,205.0,Rico_11203.xml
-11203.jpg,1080,1794,modal,69.0,198.0,943.0,1461.0,Rico_11203.xml
 11203.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_11203.xml
 6833.jpg,1080,1794,icon,55.0,509.0,39.0,54.0,Rico_6833.xml
 6833.jpg,1080,1794,text,59.0,211.0,444.0,121.0,Rico_6833.xml
@@ -3898,7 +3857,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 6833.jpg,1080,1794,image,49.0,936.0,51.0,45.0,Rico_6833.xml
 6833.jpg,1080,1794,icon,49.0,808.0,51.0,50.0,Rico_6833.xml
 6833.jpg,1080,1794,icon,49.0,682.0,50.0,50.0,Rico_6833.xml
-6833.jpg,1080,1794,drawer,1.0,66.0,734.0,1728.0,Rico_6833.xml
+6833.jpg,1080,1794,slidingmenu,1.0,66.0,734.0,1728.0,Rico_6833.xml
 6833.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_6833.xml
 6402.jpg,540,897,text,121.0,119.0,95.0,17.0,Rico_6402.xml
 6402.jpg,540,897,icon,21.0,84.0,85.0,85.0,Rico_6402.xml
@@ -3913,7 +3872,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 6402.jpg,540,897,image,22.0,340.0,31.0,31.0,Rico_6402.xml
 6402.jpg,540,897,icon,23.0,277.0,30.0,27.0,Rico_6402.xml
 6402.jpg,540,897,textbutton,188.0,178.0,181.0,49.0,Rico_6402.xml
-6402.jpg,540,897,drawer,1.0,33.0,398.0,864.0,Rico_6402.xml
+6402.jpg,540,897,slidingmenu,1.0,33.0,398.0,864.0,Rico_6402.xml
 6402.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_6402.xml
 17470.jpg,1080,1794,text,55.0,1617.0,444.0,57.0,Rico_17470.xml
 17470.jpg,1080,1794,icon,998.0,101.0,17.0,57.0,Rico_17470.xml
@@ -3933,7 +3892,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 17470.jpg,1080,1794,image,264.0,597.0,71.0,70.0,Rico_17470.xml
 17470.jpg,1080,1794,text,368.0,465.0,205.0,50.0,Rico_17470.xml
 17470.jpg,1080,1794,icon,274.0,459.0,50.0,49.0,Rico_17470.xml
-17470.jpg,1080,1794,modal,211.0,404.0,658.0,1050.0,Rico_17470.xml
 17470.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_17470.xml
 18964.jpg,540,897,image,170.0,123.0,201.0,199.0,Rico_18964.xml
 18964.jpg,540,897,text,140.0,668.0,261.0,37.0,Rico_18964.xml
@@ -3967,7 +3925,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 55848.jpg,540,897,image,25.0,398.0,55.0,56.0,Rico_55848.xml
 55848.jpg,540,897,image,25.0,319.0,56.0,55.0,Rico_55848.xml
 55848.jpg,540,897,icon,26.0,240.0,54.0,55.0,Rico_55848.xml
-55848.jpg,540,897,drawer,1.0,33.0,354.0,864.0,Rico_55848.xml
+55848.jpg,540,897,slidingmenu,1.0,33.0,354.0,864.0,Rico_55848.xml
 55848.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_55848.xml
 16971.jpg,1080,1794,text,145.0,1697.0,785.0,33.0,Rico_16971.xml
 16971.jpg,1080,1794,text,483.0,1560.0,116.0,33.0,Rico_16971.xml
@@ -4020,11 +3978,11 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 16408.jpg,1080,1794,icon,50.0,968.0,49.0,55.0,Rico_16408.xml
 16408.jpg,1080,1794,icon,42.0,1096.0,64.0,54.0,Rico_16408.xml
 16408.jpg,1080,1794,icon,47.0,1266.0,55.0,54.0,Rico_16408.xml
-16408.jpg,1080,1794,drawer,1.0,64.0,786.0,1729.0,Rico_16408.xml
+16408.jpg,1080,1794,slidingmenu,1.0,64.0,786.0,1729.0,Rico_16408.xml
 16408.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_16408.xml
 63097.jpg,540,897,text,64.0,128.0,274.0,17.0,Rico_63097.xml
 63097.jpg,540,897,icon,21.0,126.0,22.0,24.0,Rico_63097.xml
-63097.jpg,540,897,edittext,8.0,116.0,523.0,42.0,Rico_63097.xml
+63097.jpg,540,897,inputfield,8.0,116.0,523.0,42.0,Rico_63097.xml
 63097.jpg,540,897,text,23.0,707.0,73.0,18.0,Rico_63097.xml
 63097.jpg,540,897,text,21.0,644.0,56.0,19.0,Rico_63097.xml
 63097.jpg,540,897,text,23.0,580.0,87.0,16.0,Rico_63097.xml
@@ -4036,7 +3994,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 63097.jpg,540,897,text,22.0,192.0,54.0,17.0,Rico_63097.xml
 63097.jpg,540,897,text,184.0,60.0,173.0,17.0,Rico_63097.xml
 63097.jpg,540,897,icon,27.0,58.0,22.0,23.0,Rico_63097.xml
-63097.jpg,540,897,toolbar,1.0,33.0,539.0,72.0,Rico_63097.xml
 63097.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_63097.xml
 32019.jpg,540,897,text,479.0,580.0,51.0,16.0,Rico_32019.xml
 32019.jpg,540,897,image,187.0,639.0,166.0,229.0,Rico_32019.xml
@@ -4052,7 +4009,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 32019.jpg,540,897,icon,508.0,58.0,7.0,23.0,Rico_32019.xml
 32019.jpg,540,897,icon,444.0,57.0,24.0,24.0,Rico_32019.xml
 32019.jpg,540,897,icon,24.0,59.0,27.0,19.0,Rico_32019.xml
-32019.jpg,540,897,toolbar,1.0,33.0,539.0,73.0,Rico_32019.xml
 32019.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_32019.xml
 10247.jpg,540,897,image,1.0,745.0,539.0,152.0,Rico_10247.xml
 10247.jpg,540,897,image,20.0,675.0,50.0,51.0,Rico_10247.xml
@@ -4087,8 +4043,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 49482.jpg,1080,1794,icon,44.0,496.0,56.0,56.0,Rico_49482.xml
 49482.jpg,1080,1794,image,46.0,371.0,57.0,56.0,Rico_49482.xml
 49482.jpg,1080,1794,icon,47.0,246.0,55.0,56.0,Rico_49482.xml
-49482.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_49482.xml
-49482.jpg,1080,1794,drawer,1.0,211.0,629.0,1583.0,Rico_49482.xml
+49482.jpg,1080,1794,slidingmenu,1.0,211.0,629.0,1583.0,Rico_49482.xml
 49482.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_49482.xml
 15128.jpg,1080,1794,image,55.0,582.0,49.0,44.0,Rico_15128.xml
 15128.jpg,1080,1794,text,140.0,584.0,459.0,48.0,Rico_15128.xml
@@ -4098,7 +4053,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 15128.jpg,1080,1794,icon,67.0,126.0,26.0,40.0,Rico_15128.xml
 15128.jpg,1080,1794,text,139.0,437.0,242.0,46.0,Rico_15128.xml
 15128.jpg,1080,1794,icon,56.0,285.0,47.0,43.0,Rico_15128.xml
-15128.jpg,1080,1794,toolbar,1.0,64.0,1079.0,165.0,Rico_15128.xml
 15128.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_15128.xml
 7484.jpg,1080,1794,text,62.0,1222.0,951.0,107.0,Rico_7484.xml
 7484.jpg,1080,1794,text,112.0,1409.0,856.0,103.0,Rico_7484.xml
@@ -4108,7 +4062,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 28322.jpg,1080,1794,text,358.0,950.0,367.0,42.0,Rico_28322.xml
 28322.jpg,1080,1794,textbutton,228.0,766.0,625.0,131.0,Rico_28322.xml
 28322.jpg,1080,1794,text,431.0,674.0,218.0,40.0,Rico_28322.xml
-28322.jpg,1080,1794,modal,163.0,536.0,755.0,786.0,Rico_28322.xml
 28322.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_28322.xml
 63109.jpg,540,897,image,382.0,846.0,138.0,51.0,Rico_63109.xml
 63109.jpg,540,897,text,21.0,848.0,147.0,19.0,Rico_63109.xml
@@ -4134,7 +4087,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 63109.jpg,540,897,text,103.0,50.0,336.0,20.0,Rico_63109.xml
 63109.jpg,540,897,icon,490.0,55.0,28.0,28.0,Rico_63109.xml
 63109.jpg,540,897,icon,27.0,58.0,22.0,22.0,Rico_63109.xml
-63109.jpg,540,897,toolbar,1.0,32.0,539.0,75.0,Rico_63109.xml
 63109.jpg,540,897,uppertaskbar,1.0,1.0,539.0,31.0,Rico_63109.xml
 45864.jpg,540,897,text,208.0,827.0,125.0,15.0,Rico_45864.xml
 45864.jpg,540,897,icon,86.0,594.0,28.0,27.0,Rico_45864.xml
@@ -4144,7 +4096,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 45864.jpg,540,897,text,165.0,256.0,210.0,23.0,Rico_45864.xml
 45864.jpg,540,897,text,95.0,59.0,123.0,22.0,Rico_45864.xml
 45864.jpg,540,897,icon,25.0,59.0,26.0,19.0,Rico_45864.xml
-45864.jpg,540,897,toolbar,1.0,33.0,539.0,73.0,Rico_45864.xml
 45864.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_45864.xml
 8827.jpg,540,897,text,96.0,454.0,349.0,33.0,Rico_8827.xml
 8827.jpg,540,897,pageindicator,204.0,843.0,134.0,17.0,Rico_8827.xml
@@ -4193,7 +4144,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 8.jpg,1080,1794,text,44.0,277.0,303.0,45.0,Rico_8.xml
 8.jpg,1080,1794,text,191.0,117.0,239.0,53.0,Rico_8.xml
 8.jpg,1080,1794,icon,51.0,115.0,46.0,44.0,Rico_8.xml
-8.jpg,1080,1794,toolbar,1.0,62.0,1079.0,150.0,Rico_8.xml
 8.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_8.xml
 30341.jpg,1080,1794,icon,280.0,249.0,176.0,176.0,Rico_30341.xml
 30341.jpg,1080,1794,text,231.0,459.0,274.0,44.0,Rico_30341.xml
@@ -4215,8 +4165,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 30341.jpg,1080,1794,text,156.0,116.0,475.0,45.0,Rico_30341.xml
 30341.jpg,1080,1794,icon,1014.0,114.0,16.0,47.0,Rico_30341.xml
 30341.jpg,1080,1794,icon,50.0,112.0,46.0,48.0,Rico_30341.xml
-30341.jpg,1080,1794,drawer,1.0,211.0,734.0,1583.0,Rico_30341.xml
-30341.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_30341.xml
+30341.jpg,1080,1794,slidingmenu,1.0,211.0,734.0,1583.0,Rico_30341.xml
 30341.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_30341.xml
 23659.jpg,540,897,text,73.0,461.0,146.0,19.0,Rico_23659.xml
 23659.jpg,540,897,text,74.0,369.0,212.0,19.0,Rico_23659.xml
@@ -4225,14 +4174,13 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 23659.jpg,540,897,text,278.0,725.0,68.0,15.0,Rico_23659.xml
 23659.jpg,540,897,text,69.0,603.0,317.0,40.0,Rico_23659.xml
 23659.jpg,540,897,text,58.0,565.0,208.0,19.0,Rico_23659.xml
-23659.jpg,540,897,edittext,60.0,444.0,421.0,101.0,Rico_23659.xml
+23659.jpg,540,897,inputfield,60.0,444.0,421.0,101.0,Rico_23659.xml
 23659.jpg,540,897,text,57.0,421.0,91.0,18.0,Rico_23659.xml
-23659.jpg,540,897,edittext,60.0,352.0,421.0,49.0,Rico_23659.xml
+23659.jpg,540,897,inputfield,60.0,352.0,421.0,49.0,Rico_23659.xml
 23659.jpg,540,897,text,58.0,329.0,116.0,15.0,Rico_23659.xml
-23659.jpg,540,897,edittext,60.0,271.0,421.0,49.0,Rico_23659.xml
+23659.jpg,540,897,inputfield,60.0,271.0,421.0,49.0,Rico_23659.xml
 23659.jpg,540,897,text,56.0,247.0,62.0,21.0,Rico_23659.xml
 23659.jpg,540,897,text,69.0,192.0,227.0,28.0,Rico_23659.xml
-23659.jpg,540,897,modal,34.0,151.0,472.0,627.0,Rico_23659.xml
 23659.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_23659.xml
 13765.jpg,1080,1794,text,692.0,254.0,239.0,49.0,Rico_13765.xml
 13765.jpg,1080,1794,text,226.0,1766.0,349.0,28.0,Rico_13765.xml
@@ -4278,8 +4226,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 13765.jpg,1080,1794,text,392.0,116.0,296.0,45.0,Rico_13765.xml
 13765.jpg,1080,1794,text,923.0,124.0,132.0,37.0,Rico_13765.xml
 13765.jpg,1080,1794,icon,58.0,111.0,33.0,52.0,Rico_13765.xml
-13765.jpg,1080,1794,multi_tab,1.0,211.0,1079.0,126.0,Rico_13765.xml
-13765.jpg,1080,1794,toolbar,1.0,65.0,1078.0,145.0,Rico_13765.xml
 13765.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_13765.xml
 13770.jpg,1080,1794,text,375.0,1721.0,468.0,36.0,Rico_13770.xml
 13770.jpg,1080,1794,icon,265.0,1698.0,82.0,81.0,Rico_13770.xml
@@ -4299,14 +4245,13 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 7849.jpg,1080,1794,text,215.0,1594.0,652.0,31.0,Rico_7849.xml
 7849.jpg,1080,1794,text,653.0,1346.0,138.0,29.0,Rico_7849.xml
 7849.jpg,1080,1794,text,400.0,1346.0,140.0,29.0,Rico_7849.xml
-7849.jpg,1080,1794,edittext,241.0,1110.0,598.0,53.0,Rico_7849.xml
+7849.jpg,1080,1794,inputfield,241.0,1110.0,598.0,53.0,Rico_7849.xml
 7849.jpg,1080,1794,text,245.0,1039.0,139.0,26.0,Rico_7849.xml
-7849.jpg,1080,1794,edittext,240.0,906.0,595.0,53.0,Rico_7849.xml
+7849.jpg,1080,1794,inputfield,240.0,906.0,595.0,53.0,Rico_7849.xml
 7849.jpg,1080,1794,text,244.0,832.0,201.0,28.0,Rico_7849.xml
 7849.jpg,1080,1794,text,526.0,776.0,30.0,19.0,Rico_7849.xml
 7849.jpg,1080,1794,textbutton,242.0,614.0,595.0,95.0,Rico_7849.xml
 7849.jpg,1080,1794,textbutton,243.0,456.0,594.0,96.0,Rico_7849.xml
-7849.jpg,1080,1794,modal,180.0,394.0,719.0,1071.0,Rico_7849.xml
 7849.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_7849.xml
 29822.jpg,540,897,text,93.0,475.0,329.0,97.0,Rico_29822.xml
 29822.jpg,540,897,image,92.0,286.0,356.0,164.0,Rico_29822.xml
@@ -4317,17 +4262,16 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 47080.jpg,1080,1794,text,93.0,574.0,161.0,30.0,Rico_47080.xml
 47080.jpg,1080,1794,text,391.0,883.0,299.0,34.0,Rico_47080.xml
 47080.jpg,1080,1794,textbutton,79.0,709.0,923.0,127.0,Rico_47080.xml
-47080.jpg,1080,1794,edittext,89.0,574.0,903.0,66.0,Rico_47080.xml
-47080.jpg,1080,1794,edittext,85.0,428.0,911.0,56.0,Rico_47080.xml
+47080.jpg,1080,1794,inputfield,89.0,574.0,903.0,66.0,Rico_47080.xml
+47080.jpg,1080,1794,inputfield,85.0,428.0,911.0,56.0,Rico_47080.xml
 47080.jpg,1080,1794,text,160.0,116.0,549.0,60.0,Rico_47080.xml
 47080.jpg,1080,1794,icon,48.0,112.0,54.0,51.0,Rico_47080.xml
-47080.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_47080.xml
 47080.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_47080.xml
 59282.jpg,540,897,text,230.0,444.0,82.0,14.0,Rico_59282.xml
 59282.jpg,540,897,text,230.0,359.0,82.0,14.0,Rico_59282.xml
 59282.jpg,540,897,image,218.0,99.0,106.0,107.0,Rico_59282.xml
-59282.jpg,540,897,edittext,112.0,359.0,317.0,30.0,Rico_59282.xml
-59282.jpg,540,897,edittext,112.0,443.0,317.0,30.0,Rico_59282.xml
+59282.jpg,540,897,inputfield,112.0,359.0,317.0,30.0,Rico_59282.xml
+59282.jpg,540,897,inputfield,112.0,443.0,317.0,30.0,Rico_59282.xml
 59282.jpg,540,897,text,232.0,737.0,77.0,16.0,Rico_59282.xml
 59282.jpg,540,897,icon,377.0,730.0,34.0,29.0,Rico_59282.xml
 59282.jpg,540,897,icon,137.0,725.0,21.0,39.0,Rico_59282.xml
@@ -4341,9 +4285,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 27990.jpg,1080,1794,image,896.0,275.0,84.0,109.0,Rico_27990.xml
 27990.jpg,1080,1794,text,193.0,109.0,138.0,40.0,Rico_27990.xml
 27990.jpg,1080,1794,icon,48.0,107.0,52.0,37.0,Rico_27990.xml
-27990.jpg,1080,1794,card,20.0,471.0,1041.0,213.0,Rico_27990.xml
-27990.jpg,1080,1794,card,21.0,220.0,1040.0,214.0,Rico_27990.xml
-27990.jpg,1080,1794,toolbar,1.0,65.0,1079.0,125.0,Rico_27990.xml
 27990.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_27990.xml
 5125.jpg,540,897,image,1.0,107.0,151.0,152.0,Rico_5125.xml
 5125.jpg,540,897,text,283.0,747.0,57.0,19.0,Rico_5125.xml
@@ -4366,7 +4307,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 5125.jpg,540,897,text,169.0,463.0,63.0,17.0,Rico_5125.xml
 5125.jpg,540,897,text,207.0,295.0,168.0,20.0,Rico_5125.xml
 5125.jpg,540,897,icon,101.0,288.0,32.0,33.0,Rico_5125.xml
-5125.jpg,540,897,modal,94.0,273.0,353.0,384.0,Rico_5125.xml
 5125.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_5125.xml
 5131.jpg,540,897,icon,26.0,58.0,23.0,23.0,Rico_5131.xml
 5131.jpg,540,897,icon,429.0,54.0,34.0,34.0,Rico_5131.xml
@@ -4375,7 +4315,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 5131.jpg,540,897,image,142.0,110.0,212.0,225.0,Rico_5131.xml
 5131.jpg,540,897,text,157.0,383.0,224.0,48.0,Rico_5131.xml
 5131.jpg,540,897,textbutton,45.0,477.0,454.0,64.0,Rico_5131.xml
-5131.jpg,540,897,toolbar,1.0,33.0,539.0,72.0,Rico_5131.xml
 5131.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_5131.xml
 5131.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_5131.xml
 14143.jpg,1080,1794,text,185.0,937.0,712.0,75.0,Rico_14143.xml
@@ -4394,18 +4333,17 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 34522.jpg,1080,1794,icon,844.0,111.0,62.0,51.0,Rico_34522.xml
 34522.jpg,1080,1794,text,160.0,105.0,338.0,65.0,Rico_34522.xml
 34522.jpg,1080,1794,icon,49.0,121.0,51.0,35.0,Rico_34522.xml
-34522.jpg,1080,1794,edittext,361.0,1265.0,606.0,146.0,Rico_34522.xml
+34522.jpg,1080,1794,inputfield,361.0,1265.0,606.0,146.0,Rico_34522.xml
 34522.jpg,1080,1794,textbutton,113.0,1436.0,854.0,127.0,Rico_34522.xml
 34522.jpg,1080,1794,textbutton,113.0,1265.0,248.0,146.0,Rico_34522.xml
 34522.jpg,1080,1794,text,115.0,1201.0,550.0,36.0,Rico_34522.xml
-34522.jpg,1080,1794,edittext,113.0,1032.0,853.0,132.0,Rico_34522.xml
+34522.jpg,1080,1794,inputfield,113.0,1032.0,853.0,132.0,Rico_34522.xml
 34522.jpg,1080,1794,text,116.0,967.0,385.0,37.0,Rico_34522.xml
 34522.jpg,1080,1794,text,353.0,789.0,372.0,27.0,Rico_34522.xml
 34522.jpg,1080,1794,text,333.0,713.0,411.0,37.0,Rico_34522.xml
 34522.jpg,1080,1794,image,242.0,372.0,601.0,295.0,Rico_34522.xml
 34522.jpg,1080,1794,icon,81.0,249.0,54.0,54.0,Rico_34522.xml
 34522.jpg,1080,1794,text,915.0,269.0,76.0,42.0,Rico_34522.xml
-34522.jpg,1080,1794,modal,48.0,216.0,984.0,1426.0,Rico_34522.xml
 34522.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_34522.xml
 27238.jpg,1080,1794,text,302.0,1736.0,169.0,38.0,Rico_27238.xml
 27238.jpg,1080,1794,icon,242.0,277.0,52.0,28.0,Rico_27238.xml
@@ -4428,10 +4366,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 27238.jpg,1080,1794,text,159.0,118.0,329.0,42.0,Rico_27238.xml
 27238.jpg,1080,1794,icon,992.0,112.0,48.0,49.0,Rico_27238.xml
 27238.jpg,1080,1794,icon,46.0,119.0,57.0,36.0,Rico_27238.xml
-27238.jpg,1080,1794,toolbar,1.0,62.0,1079.0,148.0,Rico_27238.xml
-27238.jpg,1080,1794,card,17.0,1502.0,1043.0,292.0,Rico_27238.xml
-27238.jpg,1080,1794,card,20.0,359.0,1042.0,363.0,Rico_27238.xml
-27238.jpg,1080,1794,card,20.0,735.0,1038.0,754.0,Rico_27238.xml
 27238.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_27238.xml
 26654.jpg,1080,1794,icon,222.0,105.0,212.0,212.0,Rico_26654.xml
 26654.jpg,1080,1794,icon,50.0,114.0,46.0,44.0,Rico_26654.xml
@@ -4444,7 +4378,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 26654.jpg,1080,1794,icon,65.0,853.0,57.0,58.0,Rico_26654.xml
 26654.jpg,1080,1794,icon,68.0,669.0,51.0,58.0,Rico_26654.xml
 26654.jpg,1080,1794,textbutton,1.0,1647.0,656.0,147.0,Rico_26654.xml
-26654.jpg,1080,1794,drawer,1.0,64.0,656.0,1730.0,Rico_26654.xml
+26654.jpg,1080,1794,slidingmenu,1.0,64.0,656.0,1730.0,Rico_26654.xml
 26654.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_26654.xml
 41680.jpg,540,897,text,95.0,248.0,154.0,18.0,Rico_41680.xml
 41680.jpg,540,897,text,95.0,312.0,122.0,22.0,Rico_41680.xml
@@ -4471,7 +4405,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 41680.jpg,540,897,icon,443.0,57.0,25.0,24.0,Rico_41680.xml
 41680.jpg,540,897,text,22.0,126.0,65.0,20.0,Rico_41680.xml
 41680.jpg,540,897,icon,28.0,59.0,20.0,20.0,Rico_41680.xml
-41680.jpg,540,897,toolbar,1.0,34.0,539.0,72.0,Rico_41680.xml
 41680.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_41680.xml
 36420.jpg,1080,1794,text,279.0,511.0,525.0,160.0,Rico_36420.xml
 36420.jpg,1080,1794,image,479.0,196.0,117.0,99.0,Rico_36420.xml
@@ -4488,11 +4421,11 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 28.jpg,1080,1794,image,112.0,137.0,500.0,88.0,Rico_28.xml
 28.jpg,1080,1794,image,745.0,275.0,51.0,45.0,Rico_28.xml
 28.jpg,1080,1794,text,811.0,285.0,191.0,28.0,Rico_28.xml
-28.jpg,1080,1794,edittext,59.0,388.0,964.0,175.0,Rico_28.xml
+28.jpg,1080,1794,inputfield,59.0,388.0,964.0,175.0,Rico_28.xml
 28.jpg,1080,1794,text,88.0,458.0,547.0,31.0,Rico_28.xml
-28.jpg,1080,1794,edittext,58.0,558.0,965.0,157.0,Rico_28.xml
+28.jpg,1080,1794,inputfield,58.0,558.0,965.0,157.0,Rico_28.xml
 28.jpg,1080,1794,text,87.0,631.0,358.0,38.0,Rico_28.xml
-28.jpg,1080,1794,checkedtextview,123.0,783.0,434.0,57.0,Rico_28.xml
+28.jpg,1080,1794,checkedview,123.0,783.0,434.0,57.0,Rico_28.xml
 28.jpg,1080,1794,text,196.0,791.0,361.0,46.0,Rico_28.xml
 28.jpg,1080,1794,textbutton,34.0,922.0,1014.0,122.0,Rico_28.xml
 28.jpg,1080,1794,text,118.0,1124.0,358.0,35.0,Rico_28.xml
@@ -4531,7 +4464,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 25851.jpg,1080,1794,icon,42.0,582.0,65.0,53.0,Rico_25851.xml
 25851.jpg,1080,1794,icon,42.0,461.0,65.0,44.0,Rico_25851.xml
 25851.jpg,1080,1794,icon,41.0,336.0,66.0,43.0,Rico_25851.xml
-25851.jpg,1080,1794,drawer,1.0,64.0,911.0,1730.0,Rico_25851.xml
+25851.jpg,1080,1794,slidingmenu,1.0,64.0,911.0,1730.0,Rico_25851.xml
 25851.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_25851.xml
 29676.jpg,1080,1794,text,46.0,1236.0,800.0,78.0,Rico_29676.xml
 29676.jpg,1080,1794,text,41.0,1377.0,949.0,97.0,Rico_29676.xml
@@ -4547,12 +4480,11 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 44101.jpg,540,897,textbutton,123.0,556.0,295.0,64.0,Rico_44101.xml
 44101.jpg,540,897,textbutton,123.0,472.0,295.0,65.0,Rico_44101.xml
 44101.jpg,540,897,textbutton,123.0,301.0,295.0,64.0,Rico_44101.xml
-44101.jpg,540,897,edittext,25.0,239.0,491.0,30.0,Rico_44101.xml
-44101.jpg,540,897,edittext,26.0,158.0,489.0,31.0,Rico_44101.xml
+44101.jpg,540,897,inputfield,25.0,239.0,491.0,30.0,Rico_44101.xml
+44101.jpg,540,897,inputfield,26.0,158.0,489.0,31.0,Rico_44101.xml
 44101.jpg,540,897,text,96.0,59.0,71.0,27.0,Rico_44101.xml
 44101.jpg,540,897,icon,26.0,58.0,23.0,23.0,Rico_44101.xml
 44101.jpg,540,897,text,259.0,412.0,24.0,15.0,Rico_44101.xml
-44101.jpg,540,897,toolbar,1.0,32.0,539.0,74.0,Rico_44101.xml
 44101.jpg,540,897,uppertaskbar,1.0,1.0,539.0,31.0,Rico_44101.xml
 2002.jpg,1080,1794,textbutton,42.0,1413.0,996.0,185.0,Rico_2002.xml
 2002.jpg,1080,1794,text,435.0,1660.0,209.0,41.0,Rico_2002.xml
@@ -4594,7 +4526,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 35706.jpg,1080,1794,text,48.0,254.0,219.0,44.0,Rico_35706.xml
 35706.jpg,1080,1794,icon,842.0,133.0,41.0,25.0,Rico_35706.xml
 35706.jpg,1080,1794,text,48.0,129.0,268.0,43.0,Rico_35706.xml
-35706.jpg,1080,1794,drawer,1.0,64.0,911.0,1730.0,Rico_35706.xml
+35706.jpg,1080,1794,slidingmenu,1.0,64.0,911.0,1730.0,Rico_35706.xml
 35706.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_35706.xml
 18535.jpg,540,897,textbutton,14.0,494.0,513.0,53.0,Rico_18535.xml
 18535.jpg,540,897,textbutton,1.0,824.0,539.0,73.0,Rico_18535.xml
@@ -4622,9 +4554,9 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 17835.jpg,1080,1794,text,815.0,1699.0,212.0,44.0,Rico_17835.xml
 17835.jpg,1080,1794,text,114.0,1701.0,92.0,32.0,Rico_17835.xml
 17835.jpg,1080,1794,textbutton,352.0,1009.0,376.0,109.0,Rico_17835.xml
-17835.jpg,1080,1794,edittext,155.0,856.0,770.0,101.0,Rico_17835.xml
-17835.jpg,1080,1794,edittext,155.0,729.0,770.0,100.0,Rico_17835.xml
-17835.jpg,1080,1794,edittext,155.0,600.0,770.0,102.0,Rico_17835.xml
+17835.jpg,1080,1794,inputfield,155.0,856.0,770.0,101.0,Rico_17835.xml
+17835.jpg,1080,1794,inputfield,155.0,729.0,770.0,100.0,Rico_17835.xml
+17835.jpg,1080,1794,inputfield,155.0,600.0,770.0,102.0,Rico_17835.xml
 17835.jpg,1080,1794,text,397.0,497.0,289.0,42.0,Rico_17835.xml
 17835.jpg,1080,1794,image,458.0,222.0,164.0,163.0,Rico_17835.xml
 17835.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_17835.xml
@@ -4664,7 +4596,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 34220.jpg,1080,1794,text,67.0,446.0,647.0,49.0,Rico_34220.xml
 34220.jpg,1080,1794,image,64.0,542.0,461.0,700.0,Rico_34220.xml
 34220.jpg,1080,1794,image,556.0,543.0,462.0,699.0,Rico_34220.xml
-34220.jpg,1080,1794,edittext,32.0,105.0,1018.0,133.0,Rico_34220.xml
+34220.jpg,1080,1794,inputfield,32.0,105.0,1018.0,133.0,Rico_34220.xml
 34220.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_34220.xml
 31172.jpg,540,897,text,81.0,835.0,379.0,26.0,Rico_31172.xml
 31172.jpg,540,897,icon,491.0,51.0,35.0,36.0,Rico_31172.xml
@@ -4683,7 +4615,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 31172.jpg,540,897,text,211.0,296.0,103.0,17.0,Rico_31172.xml
 31172.jpg,540,897,image,118.0,295.0,56.0,57.0,Rico_31172.xml
 31172.jpg,540,897,text,105.0,194.0,153.0,24.0,Rico_31172.xml
-31172.jpg,540,897,modal,81.0,150.0,379.0,629.0,Rico_31172.xml
 31172.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_31172.xml
 11507.jpg,1080,1794,text,945.0,1716.0,93.0,28.0,Rico_11507.xml
 11507.jpg,1080,1794,text,39.0,1712.0,165.0,32.0,Rico_11507.xml
@@ -4693,7 +4624,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 11507.jpg,1080,1794,text,274.0,1029.0,533.0,87.0,Rico_11507.xml
 11507.jpg,1080,1794,text,393.0,948.0,294.0,49.0,Rico_11507.xml
 11507.jpg,1080,1794,image,388.0,583.0,311.0,311.0,Rico_11507.xml
-11507.jpg,1080,1794,modal,96.0,342.0,889.0,1173.0,Rico_11507.xml
 11507.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,53.0,Rico_11507.xml
 9545.jpg,1080,1794,text,219.0,1201.0,644.0,60.0,Rico_9545.xml
 9545.jpg,1080,1794,text,88.0,1343.0,907.0,90.0,Rico_9545.xml
@@ -4727,7 +4657,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 61619.jpg,1080,1794,icon,46.0,740.0,56.0,52.0,Rico_61619.xml
 61619.jpg,1080,1794,icon,47.0,614.0,55.0,54.0,Rico_61619.xml
 61619.jpg,1080,1794,icon,50.0,485.0,49.0,55.0,Rico_61619.xml
-61619.jpg,1080,1794,drawer,1.0,64.0,734.0,1730.0,Rico_61619.xml
+61619.jpg,1080,1794,slidingmenu,1.0,64.0,734.0,1730.0,Rico_61619.xml
 61619.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_61619.xml
 27880.jpg,1080,1794,text,109.0,1367.0,862.0,103.0,Rico_27880.xml
 27880.jpg,1080,1794,text,290.0,417.0,497.0,94.0,Rico_27880.xml
@@ -4765,7 +4695,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 23614.jpg,540,897,image,7.0,124.0,527.0,242.0,Rico_23614.xml
 23614.jpg,540,897,icon,487.0,52.0,33.0,34.0,Rico_23614.xml
 23614.jpg,540,897,icon,22.0,56.0,30.0,25.0,Rico_23614.xml
-23614.jpg,540,897,toolbar,1.0,33.0,539.0,71.0,Rico_23614.xml
 23614.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_23614.xml
 57156.jpg,1080,1794,text,143.0,1041.0,789.0,186.0,Rico_57156.xml
 57156.jpg,1080,1794,pageindicator,460.0,1574.0,150.0,24.0,Rico_57156.xml
@@ -4779,7 +4708,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 69912.jpg,1080,1794,text,115.0,292.0,854.0,56.0,Rico_69912.xml
 69912.jpg,1080,1794,text,46.0,117.0,440.0,44.0,Rico_69912.xml
 69912.jpg,1080,1794,text,847.0,124.0,213.0,30.0,Rico_69912.xml
-69912.jpg,1080,1794,toolbar,1.0,67.0,1079.0,144.0,Rico_69912.xml
 69912.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_69912.xml
 17228.jpg,540,897,text,113.0,394.0,209.0,20.0,Rico_17228.xml
 17228.jpg,540,897,text,112.0,328.0,115.0,16.0,Rico_17228.xml
@@ -4788,9 +4716,9 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 17228.jpg,540,897,text,143.0,852.0,255.0,19.0,Rico_17228.xml
 17228.jpg,540,897,textbutton,106.0,544.0,329.0,68.0,Rico_17228.xml
 17228.jpg,540,897,textbutton,106.0,468.0,329.0,64.0,Rico_17228.xml
-17228.jpg,540,897,edittext,111.0,394.0,319.0,26.0,Rico_17228.xml
-17228.jpg,540,897,edittext,111.0,328.0,319.0,26.0,Rico_17228.xml
-17228.jpg,540,897,edittext,111.0,263.0,319.0,24.0,Rico_17228.xml
+17228.jpg,540,897,inputfield,111.0,394.0,319.0,26.0,Rico_17228.xml
+17228.jpg,540,897,inputfield,111.0,328.0,319.0,26.0,Rico_17228.xml
+17228.jpg,540,897,inputfield,111.0,263.0,319.0,24.0,Rico_17228.xml
 17228.jpg,540,897,image,197.0,97.0,146.0,124.0,Rico_17228.xml
 17228.jpg,540,897,backgroundimage,1.0,33.0,539.0,864.0,Rico_17228.xml
 17228.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_17228.xml
@@ -4815,8 +4743,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 3337.jpg,1080,1794,image,20.0,523.0,66.0,66.0,Rico_3337.xml
 3337.jpg,1080,1794,icon,25.0,392.0,58.0,53.0,Rico_3337.xml
 3337.jpg,1080,1794,icon,23.0,249.0,60.0,61.0,Rico_3337.xml
-3337.jpg,1080,1794,toolbar,1.0,64.0,1079.0,146.0,Rico_3337.xml
-3337.jpg,1080,1794,drawer,1.0,210.0,630.0,1584.0,Rico_3337.xml
+3337.jpg,1080,1794,slidingmenu,1.0,210.0,630.0,1584.0,Rico_3337.xml
 3337.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_3337.xml
 3445.jpg,540,897,image,1.0,33.0,539.0,395.0,Rico_3445.xml
 3445.jpg,540,897,text,217.0,465.0,106.0,21.0,Rico_3445.xml
@@ -4828,7 +4755,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 36783.jpg,540,897,text,190.0,339.0,159.0,22.0,Rico_36783.xml
 36783.jpg,540,897,textbutton,53.0,539.0,435.0,65.0,Rico_36783.xml
 36783.jpg,540,897,text,64.0,392.0,414.0,121.0,Rico_36783.xml
-36783.jpg,540,897,modal,26.0,304.0,489.0,326.0,Rico_36783.xml
 36783.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_36783.xml
 13271.jpg,540,897,text,80.0,641.0,320.0,36.0,Rico_13271.xml
 13271.jpg,540,897,text,21.0,691.0,435.0,45.0,Rico_13271.xml
@@ -4878,8 +4804,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 41443.jpg,1080,1794,text,423.0,1608.0,235.0,40.0,Rico_41443.xml
 41443.jpg,1080,1794,textbutton,130.0,1437.0,821.0,139.0,Rico_41443.xml
 41443.jpg,1080,1794,text,671.0,673.0,281.0,36.0,Rico_41443.xml
-41443.jpg,1080,1794,edittext,130.0,565.0,821.0,79.0,Rico_41443.xml
-41443.jpg,1080,1794,edittext,129.0,428.0,822.0,91.0,Rico_41443.xml
+41443.jpg,1080,1794,inputfield,130.0,565.0,821.0,79.0,Rico_41443.xml
+41443.jpg,1080,1794,inputfield,129.0,428.0,822.0,91.0,Rico_41443.xml
 41443.jpg,1080,1794,icon,44.0,103.0,32.0,49.0,Rico_41443.xml
 41443.jpg,1080,1794,text,782.0,117.0,272.0,33.0,Rico_41443.xml
 41443.jpg,1080,1794,text,476.0,115.0,128.0,46.0,Rico_41443.xml
@@ -4916,7 +4842,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 24032.jpg,1080,1794,image,53.0,872.0,126.0,125.0,Rico_24032.xml
 24032.jpg,1080,1794,image,80.0,702.0,73.0,53.0,Rico_24032.xml
 24032.jpg,1080,1794,icon,53.0,460.0,126.0,125.0,Rico_24032.xml
-24032.jpg,1080,1794,drawer,1.0,64.0,839.0,1729.0,Rico_24032.xml
+24032.jpg,1080,1794,slidingmenu,1.0,64.0,839.0,1729.0,Rico_24032.xml
 24032.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_24032.xml
 34221.jpg,1080,1794,text,714.0,292.0,118.0,26.0,Rico_34221.xml
 34221.jpg,1080,1794,text,443.0,292.0,207.0,26.0,Rico_34221.xml
@@ -4943,7 +4869,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 34221.jpg,1080,1794,text,65.0,1119.0,552.0,48.0,Rico_34221.xml
 34221.jpg,1080,1794,icon,917.0,471.0,65.0,57.0,Rico_34221.xml
 34221.jpg,1080,1794,image,63.0,431.0,954.0,637.0,Rico_34221.xml
-34221.jpg,1080,1794,edittext,32.0,105.0,1018.0,133.0,Rico_34221.xml
+34221.jpg,1080,1794,inputfield,32.0,105.0,1018.0,133.0,Rico_34221.xml
 34221.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_34221.xml
 30651.jpg,1080,1794,image,304.0,220.0,474.0,97.0,Rico_30651.xml
 30651.jpg,1080,1794,text,421.0,1305.0,238.0,47.0,Rico_30651.xml
@@ -4969,7 +4895,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 10581.jpg,540,897,text,67.0,310.0,109.0,18.0,Rico_10581.xml
 10581.jpg,540,897,text,66.0,248.0,75.0,16.0,Rico_10581.xml
 10581.jpg,540,897,icon,27.0,78.0,93.0,94.0,Rico_10581.xml
-10581.jpg,540,897,drawer,1.0,33.0,314.0,864.0,Rico_10581.xml
+10581.jpg,540,897,slidingmenu,1.0,33.0,314.0,864.0,Rico_10581.xml
 10581.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_10581.xml
 41043.jpg,1080,1794,text,563.0,636.0,177.0,43.0,Rico_41043.xml
 41043.jpg,1080,1794,text,45.0,794.0,133.0,34.0,Rico_41043.xml
@@ -4984,13 +4910,12 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 41043.jpg,1080,1794,textbutton,110.0,1102.0,861.0,96.0,Rico_41043.xml
 41043.jpg,1080,1794,text,42.0,909.0,931.0,70.0,Rico_41043.xml
 41043.jpg,1080,1794,text,42.0,794.0,499.0,56.0,Rico_41043.xml
-41043.jpg,1080,1794,edittext,561.0,636.0,478.0,56.0,Rico_41043.xml
-41043.jpg,1080,1794,edittext,42.0,636.0,478.0,56.0,Rico_41043.xml
-41043.jpg,1080,1794,edittext,42.0,479.0,996.0,56.0,Rico_41043.xml
-41043.jpg,1080,1794,edittext,42.0,328.0,997.0,52.0,Rico_41043.xml
+41043.jpg,1080,1794,inputfield,561.0,636.0,478.0,56.0,Rico_41043.xml
+41043.jpg,1080,1794,inputfield,42.0,636.0,478.0,56.0,Rico_41043.xml
+41043.jpg,1080,1794,inputfield,42.0,479.0,996.0,56.0,Rico_41043.xml
+41043.jpg,1080,1794,inputfield,42.0,328.0,997.0,52.0,Rico_41043.xml
 41043.jpg,1080,1794,text,160.0,118.0,362.0,42.0,Rico_41043.xml
 41043.jpg,1080,1794,icon,52.0,116.0,45.0,44.0,Rico_41043.xml
-41043.jpg,1080,1794,toolbar,1.0,63.0,1079.0,149.0,Rico_41043.xml
 41043.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_41043.xml
 40406.jpg,1080,1794,textbutton,540.0,1658.0,540.0,136.0,Rico_40406.xml
 40406.jpg,1080,1794,textbutton,1.0,1658.0,539.0,136.0,Rico_40406.xml
@@ -5014,7 +4939,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1280.jpg,540,897,icon,497.0,58.0,23.0,23.0,Rico_1280.xml
 1280.jpg,540,897,icon,434.0,57.0,23.0,23.0,Rico_1280.xml
 1280.jpg,540,897,icon,24.0,59.0,27.0,20.0,Rico_1280.xml
-1280.jpg,540,897,toolbar,1.0,33.0,539.0,73.0,Rico_1280.xml
 1280.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_1280.xml
 69731.jpg,1080,1794,text,418.0,1501.0,247.0,40.0,Rico_69731.xml
 69731.jpg,1080,1794,text,128.0,1577.0,825.0,78.0,Rico_69731.xml
@@ -5038,7 +4962,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 28547.jpg,1080,1794,image,50.0,888.0,49.0,49.0,Rico_28547.xml
 28547.jpg,1080,1794,icon,48.0,1012.0,52.0,52.0,Rico_28547.xml
 28547.jpg,1080,1794,icon,49.0,1139.0,51.0,50.0,Rico_28547.xml
-28547.jpg,1080,1794,drawer,1.0,64.0,734.0,1730.0,Rico_28547.xml
+28547.jpg,1080,1794,slidingmenu,1.0,64.0,734.0,1730.0,Rico_28547.xml
 28547.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_28547.xml
 71591.jpg,1080,1794,text,645.0,1716.0,97.0,28.0,Rico_71591.xml
 71591.jpg,1080,1794,text,219.0,1167.0,641.0,42.0,Rico_71591.xml
@@ -5057,21 +4981,21 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1874.jpg,540,897,icon,451.0,328.0,29.0,31.0,Rico_1874.xml
 1874.jpg,540,897,icon,452.0,223.0,28.0,29.0,Rico_1874.xml
 1874.jpg,540,897,icon,462.0,114.0,67.0,57.0,Rico_1874.xml
-1874.jpg,540,897,checkedtextview,25.0,536.0,40.0,41.0,Rico_1874.xml
+1874.jpg,540,897,checkedview,25.0,536.0,40.0,41.0,Rico_1874.xml
 1874.jpg,540,897,text,164.0,556.0,25.0,15.0,Rico_1874.xml
 1874.jpg,540,897,text,90.0,544.0,65.0,28.0,Rico_1874.xml
 1874.jpg,540,897,icon,503.0,544.0,8.0,25.0,Rico_1874.xml
-1874.jpg,540,897,checkedtextview,25.0,430.0,40.0,40.0,Rico_1874.xml
+1874.jpg,540,897,checkedview,25.0,430.0,40.0,40.0,Rico_1874.xml
 1874.jpg,540,897,text,89.0,465.0,65.0,18.0,Rico_1874.xml
 1874.jpg,540,897,text,163.0,438.0,27.0,16.0,Rico_1874.xml
 1874.jpg,540,897,text,91.0,426.0,63.0,28.0,Rico_1874.xml
 1874.jpg,540,897,icon,503.0,438.0,7.0,24.0,Rico_1874.xml
-1874.jpg,540,897,checkedtextview,25.0,323.0,40.0,41.0,Rico_1874.xml
+1874.jpg,540,897,checkedview,25.0,323.0,40.0,41.0,Rico_1874.xml
 1874.jpg,540,897,text,91.0,358.0,186.0,19.0,Rico_1874.xml
 1874.jpg,540,897,text,163.0,332.0,27.0,15.0,Rico_1874.xml
 1874.jpg,540,897,text,91.0,320.0,64.0,27.0,Rico_1874.xml
 1874.jpg,540,897,icon,503.0,331.0,8.0,25.0,Rico_1874.xml
-1874.jpg,540,897,checkedtextview,25.0,217.0,40.0,40.0,Rico_1874.xml
+1874.jpg,540,897,checkedview,25.0,217.0,40.0,40.0,Rico_1874.xml
 1874.jpg,540,897,text,91.0,252.0,186.0,18.0,Rico_1874.xml
 1874.jpg,540,897,text,163.0,226.0,27.0,15.0,Rico_1874.xml
 1874.jpg,540,897,text,90.0,213.0,65.0,27.0,Rico_1874.xml
@@ -5080,7 +5004,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1874.jpg,540,897,icon,486.0,51.0,30.0,32.0,Rico_1874.xml
 1874.jpg,540,897,text,225.0,55.0,90.0,30.0,Rico_1874.xml
 1874.jpg,540,897,icon,27.0,56.0,27.0,20.0,Rico_1874.xml
-1874.jpg,540,897,toolbar,1.0,33.0,539.0,72.0,Rico_1874.xml
 1874.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_1874.xml
 40572.jpg,540,897,text,238.0,842.0,64.0,16.0,Rico_40572.xml
 40572.jpg,540,897,pageindicator,240.0,697.0,58.0,13.0,Rico_40572.xml
@@ -5123,7 +5046,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 24790.jpg,1080,1794,image,863.0,884.0,72.0,69.0,Rico_24790.xml
 24790.jpg,1080,1794,image,864.0,758.0,69.0,70.0,Rico_24790.xml
 24790.jpg,1080,1794,image,861.0,630.0,75.0,74.0,Rico_24790.xml
-24790.jpg,1080,1794,modal,69.0,434.0,943.0,990.0,Rico_24790.xml
 24790.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_24790.xml
 11501.jpg,1080,1794,text,216.0,1665.0,628.0,43.0,Rico_11501.xml
 11501.jpg,1080,1794,textbutton,213.0,1498.0,655.0,114.0,Rico_11501.xml
@@ -5160,7 +5082,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 18531.jpg,540,897,text,299.0,438.0,157.0,19.0,Rico_18531.xml
 18531.jpg,540,897,text,299.0,375.0,119.0,18.0,Rico_18531.xml
 18531.jpg,540,897,text,299.0,312.0,51.0,23.0,Rico_18531.xml
-18531.jpg,540,897,modal,277.0,37.0,259.0,443.0,Rico_18531.xml
 18531.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_18531.xml
 55592.jpg,540,897,textbutton,1.0,823.0,539.0,74.0,Rico_55592.xml
 55592.jpg,540,897,pageindicator,232.0,520.0,77.0,15.0,Rico_55592.xml
@@ -5171,7 +5092,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 55592.jpg,540,897,text,169.0,372.0,205.0,33.0,Rico_55592.xml
 55592.jpg,540,897,icon,493.0,59.0,21.0,21.0,Rico_55592.xml
 55592.jpg,540,897,text,22.0,61.0,85.0,21.0,Rico_55592.xml
-55592.jpg,540,897,spinner,111.0,61.0,83.0,20.0,Rico_55592.xml
 55592.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_55592.xml
 2210.jpg,1080,1794,image,43.0,1060.0,995.0,608.0,Rico_2210.xml
 2210.jpg,1080,1794,text,108.0,973.0,203.0,29.0,Rico_2210.xml
@@ -5184,7 +5104,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 2210.jpg,1080,1794,icon,111.0,767.0,205.0,37.0,Rico_2210.xml
 2210.jpg,1080,1794,text,186.0,1715.0,762.0,36.0,Rico_2210.xml
 2210.jpg,1080,1794,icon,55.0,1703.0,39.0,55.0,Rico_2210.xml
-2210.jpg,1080,1794,map,43.0,1060.0,995.0,608.0,Rico_2210.xml
 2210.jpg,1080,1794,text,333.0,771.0,216.0,30.0,Rico_2210.xml
 2210.jpg,1080,1794,text,42.0,771.0,46.0,30.0,Rico_2210.xml
 2210.jpg,1080,1794,text,47.0,670.0,634.0,61.0,Rico_2210.xml
@@ -5236,9 +5155,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1282.jpg,540,897,text,371.0,134.0,68.0,22.0,Rico_1282.xml
 1282.jpg,540,897,icon,42.0,58.0,23.0,22.0,Rico_1282.xml
 1282.jpg,540,897,icon,483.0,59.0,20.0,20.0,Rico_1282.xml
-1282.jpg,540,897,edittext,11.0,37.0,519.0,64.0,Rico_1282.xml
-1282.jpg,540,897,toolbar,1.0,33.0,539.0,73.0,Rico_1282.xml
-1282.jpg,540,897,multi_tab,1.0,106.0,539.0,74.0,Rico_1282.xml
+1282.jpg,540,897,inputfield,11.0,37.0,519.0,64.0,Rico_1282.xml
 1282.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_1282.xml
 52996.jpg,1080,1794,icon,51.0,527.0,48.0,48.0,Rico_52996.xml
 52996.jpg,1080,1794,icon,52.0,649.0,45.0,54.0,Rico_52996.xml
@@ -5258,7 +5175,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 52996.jpg,1080,1794,icon,697.0,360.0,35.0,18.0,Rico_52996.xml
 52996.jpg,1080,1794,text,45.0,325.0,226.0,44.0,Rico_52996.xml
 52996.jpg,1080,1794,image,42.0,108.0,164.0,164.0,Rico_52996.xml
-52996.jpg,1080,1794,drawer,1.0,64.0,787.0,1730.0,Rico_52996.xml
+52996.jpg,1080,1794,slidingmenu,1.0,64.0,787.0,1730.0,Rico_52996.xml
 52996.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_52996.xml
 12425.jpg,1080,1794,text,887.0,68.0,142.0,38.0,Rico_12425.xml
 12425.jpg,1080,1794,text,404.0,160.0,271.0,43.0,Rico_12425.xml
@@ -5285,7 +5202,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 30109.jpg,540,897,image,1.0,509.0,539.0,197.0,Rico_30109.xml
 30109.jpg,540,897,image,1.0,312.0,539.0,197.0,Rico_30109.xml
 30109.jpg,540,897,image,1.0,117.0,539.0,195.0,Rico_30109.xml
-30109.jpg,540,897,toolbar,1.0,33.0,539.0,83.0,Rico_30109.xml
 30109.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_30109.xml
 9378.jpg,540,897,text,119.0,479.0,403.0,62.0,Rico_9378.xml
 9378.jpg,540,897,text,111.0,576.0,420.0,59.0,Rico_9378.xml
@@ -5302,36 +5218,33 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 7547.jpg,540,897,image,64.0,131.0,412.0,307.0,Rico_7547.xml
 7547.jpg,540,897,text,81.0,60.0,194.0,18.0,Rico_7547.xml
 7547.jpg,540,897,icon,27.0,58.0,21.0,22.0,Rico_7547.xml
-7547.jpg,540,897,toolbar,1.0,28.0,539.0,79.0,Rico_7547.xml
 7547.jpg,540,897,uppertaskbar,1.0,1.0,539.0,27.0,Rico_7547.xml
 475.jpg,1080,1794,text,67.0,673.0,202.0,39.0,Rico_475.xml
 475.jpg,1080,1794,text,67.0,484.0,96.0,32.0,Rico_475.xml
 475.jpg,1080,1794,text,351.0,883.0,379.0,40.0,Rico_475.xml
-475.jpg,1080,1794,edittext,62.0,672.0,978.0,62.0,Rico_475.xml
-475.jpg,1080,1794,edittext,63.0,482.0,977.0,55.0,Rico_475.xml
+475.jpg,1080,1794,inputfield,62.0,672.0,978.0,62.0,Rico_475.xml
+475.jpg,1080,1794,inputfield,63.0,482.0,977.0,55.0,Rico_475.xml
 475.jpg,1080,1794,text,190.0,115.0,163.0,49.0,Rico_475.xml
 475.jpg,1080,1794,icon,52.0,116.0,45.0,44.0,Rico_475.xml
-475.jpg,1080,1794,toolbar,1.0,64.0,1079.0,150.0,Rico_475.xml
 475.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_475.xml
-677.jpg,1080,1794,checkedtextview,971.0,1578.0,51.0,51.0,Rico_677.xml
+677.jpg,1080,1794,checkedview,971.0,1578.0,51.0,51.0,Rico_677.xml
 677.jpg,1080,1794,text,42.0,1597.0,832.0,73.0,Rico_677.xml
 677.jpg,1080,1794,text,43.0,1542.0,358.0,42.0,Rico_677.xml
 677.jpg,1080,1794,text,45.0,1398.0,487.0,43.0,Rico_677.xml
 677.jpg,1080,1794,text,44.0,1254.0,647.0,43.0,Rico_677.xml
 677.jpg,1080,1794,text,44.0,1110.0,413.0,43.0,Rico_677.xml
-677.jpg,1080,1794,checkedtextview,970.0,910.0,51.0,51.0,Rico_677.xml
+677.jpg,1080,1794,checkedview,970.0,910.0,51.0,51.0,Rico_677.xml
 677.jpg,1080,1794,text,43.0,928.0,775.0,81.0,Rico_677.xml
 677.jpg,1080,1794,text,45.0,874.0,292.0,42.0,Rico_677.xml
 677.jpg,1080,1794,text,45.0,735.0,116.0,32.0,Rico_677.xml
 677.jpg,1080,1794,text,42.0,680.0,130.0,36.0,Rico_677.xml
 677.jpg,1080,1794,text,42.0,584.0,396.0,38.0,Rico_677.xml
-677.jpg,1080,1794,checkedtextview,970.0,408.0,51.0,51.0,Rico_677.xml
+677.jpg,1080,1794,checkedview,970.0,408.0,51.0,51.0,Rico_677.xml
 677.jpg,1080,1794,text,44.0,447.0,433.0,38.0,Rico_677.xml
 677.jpg,1080,1794,text,44.0,394.0,309.0,41.0,Rico_677.xml
 677.jpg,1080,1794,text,43.0,254.0,869.0,38.0,Rico_677.xml
 677.jpg,1080,1794,text,45.0,210.0,276.0,31.0,Rico_677.xml
 677.jpg,1080,1794,text,45.0,116.0,283.0,43.0,Rico_677.xml
-677.jpg,1080,1794,toolbar,1.0,65.0,1079.0,143.0,Rico_677.xml
 677.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_677.xml
 1491.jpg,1080,1794,image,1.0,63.0,797.0,496.0,Rico_1491.xml
 1491.jpg,1080,1794,text,181.0,633.0,166.0,38.0,Rico_1491.xml
@@ -5344,7 +5257,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1491.jpg,1080,1794,icon,47.0,858.0,60.0,59.0,Rico_1491.xml
 1491.jpg,1080,1794,icon,45.0,741.0,62.0,53.0,Rico_1491.xml
 1491.jpg,1080,1794,text,46.0,618.0,61.0,58.0,Rico_1491.xml
-1491.jpg,1080,1794,drawer,1.0,63.0,797.0,1731.0,Rico_1491.xml
+1491.jpg,1080,1794,slidingmenu,1.0,63.0,797.0,1731.0,Rico_1491.xml
 1491.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_1491.xml
 29510.jpg,1080,1794,text,132.0,1032.0,816.0,193.0,Rico_29510.xml
 29510.jpg,1080,1794,image,340.0,506.0,401.0,400.0,Rico_29510.xml
@@ -5386,20 +5299,18 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 3843.jpg,1080,1794,icon,91.0,801.0,64.0,72.0,Rico_3843.xml
 3843.jpg,1080,1794,icon,87.0,953.0,72.0,70.0,Rico_3843.xml
 3843.jpg,1080,1794,icon,89.0,1109.0,68.0,59.0,Rico_3843.xml
-3843.jpg,1080,1794,toolbar,1.0,72.0,1079.0,140.0,Rico_3843.xml
-3843.jpg,1080,1794,drawer,1.0,212.0,785.0,1582.0,Rico_3843.xml
+3843.jpg,1080,1794,slidingmenu,1.0,212.0,785.0,1582.0,Rico_3843.xml
 3843.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_3843.xml
-4679.jpg,1080,1794,modal,142.0,387.0,798.0,1019.0,Rico_4679.xml
 4679.jpg,1080,1794,text,185.0,452.0,208.0,55.0,Rico_4679.xml
-4679.jpg,1080,1794,checkedtextview,208.0,622.0,627.0,51.0,Rico_4679.xml
+4679.jpg,1080,1794,checkedview,208.0,622.0,627.0,51.0,Rico_4679.xml
 4679.jpg,1080,1794,text,208.0,627.0,368.0,46.0,Rico_4679.xml
-4679.jpg,1080,1794,checkedtextview,206.0,792.0,630.0,44.0,Rico_4679.xml
+4679.jpg,1080,1794,checkedview,206.0,792.0,630.0,44.0,Rico_4679.xml
 4679.jpg,1080,1794,text,206.0,796.0,443.0,38.0,Rico_4679.xml
-4679.jpg,1080,1794,checkedtextview,207.0,962.0,623.0,43.0,Rico_4679.xml
+4679.jpg,1080,1794,checkedview,207.0,962.0,623.0,43.0,Rico_4679.xml
 4679.jpg,1080,1794,text,207.0,967.0,279.0,36.0,Rico_4679.xml
-4679.jpg,1080,1794,checkedtextview,206.0,1131.0,629.0,44.0,Rico_4679.xml
+4679.jpg,1080,1794,checkedview,206.0,1131.0,629.0,44.0,Rico_4679.xml
 4679.jpg,1080,1794,text,206.0,1135.0,198.0,37.0,Rico_4679.xml
-4679.jpg,1080,1794,checkedtextview,207.0,1300.0,628.0,44.0,Rico_4679.xml
+4679.jpg,1080,1794,checkedview,207.0,1300.0,628.0,44.0,Rico_4679.xml
 4679.jpg,1080,1794,text,207.0,1305.0,234.0,38.0,Rico_4679.xml
 30138.jpg,540,897,icon,493.0,61.0,28.0,27.0,Rico_30138.xml
 30138.jpg,540,897,icon,433.0,62.0,17.0,24.0,Rico_30138.xml
@@ -5422,7 +5333,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 30138.jpg,540,897,text,90.0,297.0,195.0,17.0,Rico_30138.xml
 30138.jpg,540,897,image,22.0,284.0,48.0,45.0,Rico_30138.xml
 30138.jpg,540,897,text,21.0,211.0,230.0,21.0,Rico_30138.xml
-30138.jpg,540,897,modal,1.0,181.0,539.0,716.0,Rico_30138.xml
 30138.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_30138.xml
 17222.jpg,1080,1794,image,276.0,420.0,528.0,529.0,Rico_17222.xml
 17222.jpg,1080,1794,text,147.0,151.0,786.0,166.0,Rico_17222.xml
@@ -5469,8 +5379,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 6319.jpg,1081,1794,textbutton,1.0,292.0,540.0,119.0,Rico_6319.xml
 6319.jpg,1081,1794,textbutton,542.0,293.0,539.0,118.0,Rico_6319.xml
 6319.jpg,1081,1794,icon,41.0,105.0,45.0,44.0,Rico_6319.xml
-6319.jpg,1081,1794,edittext,66.0,571.0,950.0,88.0,Rico_6319.xml
-6319.jpg,1081,1794,edittext,65.0,710.0,951.0,87.0,Rico_6319.xml
+6319.jpg,1081,1794,inputfield,66.0,571.0,950.0,88.0,Rico_6319.xml
+6319.jpg,1081,1794,inputfield,65.0,710.0,951.0,87.0,Rico_6319.xml
 6319.jpg,1081,1794,text,721.0,844.0,294.0,39.0,Rico_6319.xml
 6319.jpg,1081,1794,text,461.0,1444.0,161.0,34.0,Rico_6319.xml
 6319.jpg,1081,1794,textbutton,66.0,975.0,950.0,116.0,Rico_6319.xml
@@ -5492,7 +5402,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 18925.jpg,1080,1794,text,942.0,113.0,93.0,30.0,Rico_18925.xml
 18925.jpg,1080,1794,text,762.0,112.0,79.0,30.0,Rico_18925.xml
 18925.jpg,1080,1794,image,38.0,74.0,184.0,96.0,Rico_18925.xml
-18925.jpg,1080,1794,toolbar,1.0,64.0,1079.0,126.0,Rico_18925.xml
 18925.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_18925.xml
 69104.jpg,1080,1794,text,240.0,1336.0,599.0,63.0,Rico_69104.xml
 69104.jpg,1080,1794,text,225.0,1443.0,623.0,101.0,Rico_69104.xml
@@ -5511,7 +5420,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 27241.jpg,1080,1794,text,161.0,117.0,630.0,42.0,Rico_27241.xml
 27241.jpg,1080,1794,icon,848.0,101.0,65.0,72.0,Rico_27241.xml
 27241.jpg,1080,1794,icon,52.0,115.0,45.0,44.0,Rico_27241.xml
-27241.jpg,1080,1794,toolbar,1.0,67.0,1079.0,141.0,Rico_27241.xml
 27241.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_27241.xml
 37536.jpg,1080,1794,text,673.0,1651.0,87.0,36.0,Rico_37536.xml
 37536.jpg,1080,1794,text,320.0,1650.0,297.0,37.0,Rico_37536.xml
@@ -5529,7 +5437,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 25126.jpg,1080,1794,textbutton,186.0,1003.0,708.0,120.0,Rico_25126.xml
 25126.jpg,1080,1794,textbutton,187.0,1175.0,708.0,120.0,Rico_25126.xml
 25126.jpg,1080,1794,textbutton,186.0,1347.0,708.0,119.0,Rico_25126.xml
-25126.jpg,1080,1794,modal,134.0,229.0,815.0,1400.0,Rico_25126.xml
 25126.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_25126.xml
 23580.jpg,1080,1794,text,137.0,769.0,269.0,105.0,Rico_23580.xml
 23580.jpg,1080,1794,text,632.0,768.0,347.0,106.0,Rico_23580.xml
@@ -5567,7 +5474,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1931.jpg,1080,1794,image,43.0,740.0,55.0,80.0,Rico_1931.xml
 1931.jpg,1080,1794,icon,34.0,599.0,74.0,81.0,Rico_1931.xml
 1931.jpg,1080,1794,textbutton,26.0,448.0,238.0,96.0,Rico_1931.xml
-1931.jpg,1080,1794,drawer,1.0,64.0,838.0,1730.0,Rico_1931.xml
+1931.jpg,1080,1794,slidingmenu,1.0,64.0,838.0,1730.0,Rico_1931.xml
 1931.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_1931.xml
 44862.jpg,1080,1794,text,241.0,1012.0,591.0,58.0,Rico_44862.xml
 44862.jpg,1080,1794,text,57.0,1188.0,966.0,160.0,Rico_44862.xml
@@ -5588,8 +5495,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 917.jpg,1080,1794,text,192.0,116.0,289.0,44.0,Rico_917.xml
 917.jpg,1080,1794,icon,998.0,119.0,37.0,36.0,Rico_917.xml
 917.jpg,1080,1794,icon,52.0,116.0,45.0,43.0,Rico_917.xml
-917.jpg,1080,1794,card,16.0,221.0,1049.0,789.0,Rico_917.xml
-917.jpg,1080,1794,toolbar,1.0,64.0,1079.0,148.0,Rico_917.xml
 917.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_917.xml
 64999.jpg,540,897,text,63.0,632.0,378.0,36.0,Rico_64999.xml
 64999.jpg,540,897,text,63.0,696.0,389.0,54.0,Rico_64999.xml
@@ -5601,7 +5506,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 23422.jpg,1080,1794,text,65.0,587.0,362.0,56.0,Rico_23422.xml
 23422.jpg,1080,1794,text,66.0,367.0,262.0,56.0,Rico_23422.xml
 23422.jpg,1080,1794,text,69.0,147.0,213.0,55.0,Rico_23422.xml
-23422.jpg,1080,1794,drawer,1.0,63.0,656.0,1731.0,Rico_23422.xml
+23422.jpg,1080,1794,slidingmenu,1.0,63.0,656.0,1731.0,Rico_23422.xml
 23422.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_23422.xml
 7548.jpg,540,897,text,195.0,149.0,152.0,18.0,Rico_7548.xml
 7548.jpg,540,897,text,79.0,60.0,136.0,19.0,Rico_7548.xml
@@ -5609,14 +5514,13 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 7548.jpg,540,897,image,86.0,237.0,369.0,204.0,Rico_7548.xml
 7548.jpg,540,897,textbutton,139.0,479.0,263.0,65.0,Rico_7548.xml
 7548.jpg,540,897,icon,24.0,58.0,27.0,20.0,Rico_7548.xml
-7548.jpg,540,897,toolbar,1.0,28.0,539.0,82.0,Rico_7548.xml
 7548.jpg,540,897,uppertaskbar,1.0,1.0,539.0,27.0,Rico_7548.xml
 55188.jpg,1080,1794,text,77.0,803.0,222.0,40.0,Rico_55188.xml
 55188.jpg,1080,1794,text,77.0,616.0,112.0,40.0,Rico_55188.xml
 55188.jpg,1080,1794,image,305.0,150.0,470.0,111.0,Rico_55188.xml
 55188.jpg,1080,1794,textbutton,310.0,388.0,461.0,89.0,Rico_55188.xml
-55188.jpg,1080,1794,edittext,73.0,615.0,935.0,62.0,Rico_55188.xml
-55188.jpg,1080,1794,edittext,72.0,803.0,937.0,63.0,Rico_55188.xml
+55188.jpg,1080,1794,inputfield,73.0,615.0,935.0,62.0,Rico_55188.xml
+55188.jpg,1080,1794,inputfield,72.0,803.0,937.0,63.0,Rico_55188.xml
 55188.jpg,1080,1794,textbutton,73.0,984.0,935.0,100.0,Rico_55188.xml
 55188.jpg,1080,1794,text,285.0,1171.0,512.0,44.0,Rico_55188.xml
 55188.jpg,1080,1794,text,325.0,1289.0,434.0,45.0,Rico_55188.xml
@@ -5632,7 +5536,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 31142.jpg,540,897,icon,433.0,50.0,34.0,27.0,Rico_31142.xml
 31142.jpg,540,897,icon,259.0,50.0,24.0,29.0,Rico_31142.xml
 31142.jpg,540,897,icon,79.0,52.0,24.0,24.0,Rico_31142.xml
-31142.jpg,540,897,multi_tab,1.0,34.0,538.0,64.0,Rico_31142.xml
 31142.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_31142.xml
 32339.jpg,1080,1794,text,247.0,1106.0,589.0,80.0,Rico_32339.xml
 32339.jpg,1080,1794,text,222.0,1210.0,636.0,91.0,Rico_32339.xml
@@ -5656,7 +5559,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 37241.jpg,540,897,icon,434.0,55.0,23.0,28.0,Rico_37241.xml
 37241.jpg,540,897,image,360.0,106.0,159.0,148.0,Rico_37241.xml
 37241.jpg,540,897,icon,26.0,58.0,22.0,22.0,Rico_37241.xml
-37241.jpg,540,897,toolbar,1.0,33.0,539.0,73.0,Rico_37241.xml
 37241.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_37241.xml
 29916.jpg,540,897,text,20.0,178.0,497.0,238.0,Rico_29916.xml
 29916.jpg,540,897,image,54.0,861.0,61.0,36.0,Rico_29916.xml
@@ -5677,7 +5579,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 29916.jpg,540,897,image,176.0,540.0,64.0,64.0,Rico_29916.xml
 29916.jpg,540,897,icon,58.0,546.0,52.0,52.0,Rico_29916.xml
 29916.jpg,540,897,text,22.0,484.0,47.0,16.0,Rico_29916.xml
-29916.jpg,540,897,modal,1.0,464.0,539.0,433.0,Rico_29916.xml
 29916.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_29916.xml
 21225.jpg,1080,1794,image,76.0,444.0,705.0,792.0,Rico_21225.xml
 21225.jpg,1080,1794,text,929.0,104.0,97.0,54.0,Rico_21225.xml
@@ -5700,8 +5601,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 22506.jpg,1080,1794,icon,704.0,1128.0,71.0,71.0,Rico_22506.xml
 22506.jpg,1080,1794,icon,140.0,1128.0,71.0,71.0,Rico_22506.xml
 22506.jpg,1080,1794,text,424.0,1057.0,234.0,38.0,Rico_22506.xml
-22506.jpg,1080,1794,edittext,130.0,913.0,821.0,78.0,Rico_22506.xml
-22506.jpg,1080,1794,edittext,129.0,789.0,822.0,78.0,Rico_22506.xml
+22506.jpg,1080,1794,inputfield,130.0,913.0,821.0,78.0,Rico_22506.xml
+22506.jpg,1080,1794,inputfield,129.0,789.0,822.0,78.0,Rico_22506.xml
 22506.jpg,1080,1794,text,807.0,115.0,246.0,42.0,Rico_22506.xml
 22506.jpg,1080,1794,text,458.0,113.0,165.0,49.0,Rico_22506.xml
 22506.jpg,1080,1794,icon,43.0,102.0,34.0,51.0,Rico_22506.xml
@@ -5721,7 +5622,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 23181.jpg,540,897,icon,262.0,445.0,29.0,23.0,Rico_23181.xml
 23181.jpg,540,897,textbutton,155.0,347.0,231.0,40.0,Rico_23181.xml
 23181.jpg,540,897,text,95.0,250.0,352.0,53.0,Rico_23181.xml
-23181.jpg,540,897,modal,70.0,216.0,400.0,497.0,Rico_23181.xml
 23181.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_23181.xml
 19778.jpg,1080,1794,text,95.0,951.0,893.0,57.0,Rico_19778.xml
 19778.jpg,1080,1794,text,71.0,1076.0,941.0,160.0,Rico_19778.xml
@@ -5733,8 +5633,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 39480.jpg,1080,1794,text,140.0,450.0,108.0,37.0,Rico_39480.xml
 39480.jpg,1080,1794,textbutton,126.0,853.0,829.0,127.0,Rico_39480.xml
 39480.jpg,1080,1794,text,353.0,1025.0,376.0,41.0,Rico_39480.xml
-39480.jpg,1080,1794,edittext,136.0,705.0,809.0,67.0,Rico_39480.xml
-39480.jpg,1080,1794,edittext,136.0,449.0,809.0,65.0,Rico_39480.xml
+39480.jpg,1080,1794,inputfield,136.0,705.0,809.0,67.0,Rico_39480.xml
+39480.jpg,1080,1794,inputfield,136.0,449.0,809.0,65.0,Rico_39480.xml
 39480.jpg,1080,1794,image,366.0,231.0,127.0,128.0,Rico_39480.xml
 39480.jpg,1080,1794,icon,83.0,105.0,45.0,44.0,Rico_39480.xml
 39480.jpg,1080,1794,text,527.0,273.0,189.0,53.0,Rico_39480.xml
@@ -5756,7 +5656,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 54718.jpg,1080,1794,icon,49.0,757.0,50.0,51.0,Rico_54718.xml
 54718.jpg,1080,1794,icon,50.0,638.0,48.0,37.0,Rico_54718.xml
 54718.jpg,1080,1794,icon,49.0,503.0,51.0,56.0,Rico_54718.xml
-54718.jpg,1080,1794,drawer,1.0,65.0,734.0,1729.0,Rico_54718.xml
+54718.jpg,1080,1794,slidingmenu,1.0,65.0,734.0,1729.0,Rico_54718.xml
 54718.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_54718.xml
 14466.jpg,1080,1794,image,200.0,342.0,750.0,950.0,Rico_14466.xml
 14466.jpg,1080,1794,text,193.0,102.0,305.0,50.0,Rico_14466.xml
@@ -5768,7 +5668,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 14466.jpg,1080,1794,text,867.0,1717.0,92.0,30.0,Rico_14466.xml
 14466.jpg,1080,1794,icon,985.0,1715.0,23.0,33.0,Rico_14466.xml
 14466.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_14466.xml
-325.jpg,1080,1794,checkedtextview,972.0,753.0,49.0,50.0,Rico_325.xml
+325.jpg,1080,1794,checkedview,972.0,753.0,49.0,50.0,Rico_325.xml
 325.jpg,1080,1794,text,46.0,792.0,479.0,38.0,Rico_325.xml
 325.jpg,1080,1794,text,46.0,738.0,237.0,43.0,Rico_325.xml
 325.jpg,1080,1794,text,42.0,556.0,797.0,81.0,Rico_325.xml
@@ -5777,7 +5677,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 325.jpg,1080,1794,text,43.0,265.0,450.0,43.0,Rico_325.xml
 325.jpg,1080,1794,text,161.0,117.0,571.0,53.0,Rico_325.xml
 325.jpg,1080,1794,icon,52.0,116.0,45.0,44.0,Rico_325.xml
-325.jpg,1080,1794,toolbar,1.0,65.0,1079.0,144.0,Rico_325.xml
 325.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_325.xml
 36162.jpg,1080,1794,textbutton,211.0,1448.0,659.0,120.0,Rico_36162.xml
 36162.jpg,1080,1794,text,244.0,1615.0,602.0,71.0,Rico_36162.xml
@@ -5789,8 +5688,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 60326.jpg,1080,1794,text,442.0,657.0,199.0,38.0,Rico_60326.xml
 60326.jpg,1080,1794,text,438.0,499.0,207.0,38.0,Rico_60326.xml
 60326.jpg,1080,1794,text,293.0,266.0,494.0,101.0,Rico_60326.xml
-60326.jpg,1080,1794,edittext,89.0,452.0,903.0,133.0,Rico_60326.xml
-60326.jpg,1080,1794,edittext,89.0,610.0,903.0,133.0,Rico_60326.xml
+60326.jpg,1080,1794,inputfield,89.0,452.0,903.0,133.0,Rico_60326.xml
+60326.jpg,1080,1794,inputfield,89.0,610.0,903.0,133.0,Rico_60326.xml
 60326.jpg,1080,1794,textbutton,89.0,766.0,903.0,134.0,Rico_60326.xml
 60326.jpg,1080,1794,text,389.0,1159.0,304.0,81.0,Rico_60326.xml
 60326.jpg,1080,1794,icon,465.0,1271.0,151.0,151.0,Rico_60326.xml
@@ -5837,7 +5736,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 16501.jpg,1080,1794,icon,47.0,613.0,55.0,57.0,Rico_16501.xml
 16501.jpg,1080,1794,icon,48.0,490.0,54.0,48.0,Rico_16501.xml
 16501.jpg,1080,1794,icon,624.0,318.0,55.0,59.0,Rico_16501.xml
-16501.jpg,1080,1794,drawer,1.0,64.0,734.0,1730.0,Rico_16501.xml
+16501.jpg,1080,1794,slidingmenu,1.0,64.0,734.0,1730.0,Rico_16501.xml
 16501.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_16501.xml
 47766.jpg,1080,1794,text,186.0,1247.0,710.0,49.0,Rico_47766.xml
 47766.jpg,1080,1794,text,497.0,1632.0,87.0,41.0,Rico_47766.xml
@@ -5887,8 +5786,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 17226.jpg,1080,1794,icon,50.0,1686.0,91.0,91.0,Rico_17226.xml
 17226.jpg,1080,1794,text,188.0,116.0,320.0,45.0,Rico_17226.xml
 17226.jpg,1080,1794,icon,51.0,114.0,46.0,47.0,Rico_17226.xml
-17226.jpg,1080,1794,card,20.0,231.0,1041.0,655.0,Rico_17226.xml
-17226.jpg,1080,1794,toolbar,1.0,65.0,1079.0,146.0,Rico_17226.xml
 17226.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_17226.xml
 13040.jpg,1080,1794,text,341.0,943.0,401.0,47.0,Rico_13040.xml
 13040.jpg,1080,1794,text,276.0,1027.0,528.0,120.0,Rico_13040.xml
@@ -5901,7 +5798,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 10763.jpg,1080,1794,text,178.0,472.0,724.0,60.0,Rico_10763.xml
 10763.jpg,1080,1794,text,42.0,622.0,996.0,127.0,Rico_10763.xml
 10763.jpg,1080,1794,text,172.0,888.0,737.0,44.0,Rico_10763.xml
-10763.jpg,1080,1794,edittext,42.0,954.0,997.0,148.0,Rico_10763.xml
+10763.jpg,1080,1794,inputfield,42.0,954.0,997.0,148.0,Rico_10763.xml
 10763.jpg,1080,1794,textbutton,42.0,1122.0,997.0,127.0,Rico_10763.xml
 10763.jpg,1080,1794,pageindicator,473.0,1711.0,134.0,31.0,Rico_10763.xml
 10763.jpg,1080,1794,backgroundimage,1.0,64.0,1079.0,1730.0,Rico_10763.xml
@@ -5915,7 +5812,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 13281.jpg,540,897,text,445.0,36.0,53.0,16.0,Rico_13281.xml
 13281.jpg,540,897,text,210.0,25.0,120.0,34.0,Rico_13281.xml
 13281.jpg,540,897,text,22.0,36.0,96.0,15.0,Rico_13281.xml
-13281.jpg,540,897,edittext,117.0,413.0,307.0,30.0,Rico_13281.xml
+13281.jpg,540,897,inputfield,117.0,413.0,307.0,30.0,Rico_13281.xml
 13281.jpg,540,897,text,93.0,606.0,357.0,41.0,Rico_13281.xml
 13281.jpg,540,897,text,100.0,540.0,99.0,20.0,Rico_13281.xml
 13281.jpg,540,897,icon,316.0,521.0,67.0,68.0,Rico_13281.xml
@@ -5924,10 +5821,9 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 13281.jpg,540,897,icon,75.0,350.0,34.0,27.0,Rico_13281.xml
 13281.jpg,540,897,icon,77.0,289.0,31.0,31.0,Rico_13281.xml
 13281.jpg,540,897,icon,78.0,403.0,29.0,37.0,Rico_13281.xml
-13281.jpg,540,897,edittext,117.0,354.0,307.0,30.0,Rico_13281.xml
-13281.jpg,540,897,edittext,117.0,299.0,307.0,26.0,Rico_13281.xml
+13281.jpg,540,897,inputfield,117.0,354.0,307.0,30.0,Rico_13281.xml
+13281.jpg,540,897,inputfield,117.0,299.0,307.0,26.0,Rico_13281.xml
 13281.jpg,540,897,text,143.0,242.0,254.0,20.0,Rico_13281.xml
-13281.jpg,540,897,modal,51.0,216.0,439.0,466.0,Rico_13281.xml
 54055.jpg,1080,1794,image,310.0,993.0,459.0,152.0,Rico_54055.xml
 54055.jpg,1080,1794,textbutton,48.0,1221.0,985.0,145.0,Rico_54055.xml
 54055.jpg,1080,1794,textbutton,47.0,1417.0,987.0,148.0,Rico_54055.xml
@@ -5948,8 +5844,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 70108.jpg,1080,1794,text,190.0,1554.0,257.0,30.0,Rico_70108.xml
 70108.jpg,1080,1794,image,41.0,1410.0,67.0,66.0,Rico_70108.xml
 70108.jpg,1080,1794,image,41.0,1534.0,67.0,67.0,Rico_70108.xml
-70108.jpg,1080,1794,drawer,1.0,211.0,840.0,1583.0,Rico_70108.xml
-70108.jpg,1080,1794,toolbar,1.0,65.0,1079.0,146.0,Rico_70108.xml
+70108.jpg,1080,1794,slidingmenu,1.0,211.0,840.0,1583.0,Rico_70108.xml
 70108.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_70108.xml
 37243.jpg,540,897,image,37.0,57.0,29.0,17.0,Rico_37243.xml
 37243.jpg,540,897,icon,40.0,121.0,22.0,19.0,Rico_37243.xml
@@ -5967,7 +5862,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 37243.jpg,540,897,text,80.0,187.0,62.0,20.0,Rico_37243.xml
 37243.jpg,540,897,text,81.0,122.0,73.0,23.0,Rico_37243.xml
 37243.jpg,540,897,text,81.0,57.0,62.0,19.0,Rico_37243.xml
-37243.jpg,540,897,drawer,1.0,32.0,393.0,865.0,Rico_37243.xml
+37243.jpg,540,897,slidingmenu,1.0,32.0,393.0,865.0,Rico_37243.xml
 37243.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_37243.xml
 59767.jpg,1080,1794,text,920.0,101.0,66.0,39.0,Rico_59767.xml
 59767.jpg,1080,1794,image,173.0,427.0,737.0,787.0,Rico_59767.xml
@@ -5977,10 +5872,10 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 15287.jpg,540,897,text,96.0,413.0,43.0,13.0,Rico_15287.xml
 15287.jpg,540,897,text,97.0,345.0,66.0,20.0,Rico_15287.xml
 15287.jpg,540,897,textbutton,90.0,579.0,134.0,51.0,Rico_15287.xml
-15287.jpg,540,897,edittext,95.0,523.0,351.0,32.0,Rico_15287.xml
-15287.jpg,540,897,edittext,95.0,463.0,351.0,32.0,Rico_15287.xml
-15287.jpg,540,897,edittext,95.0,411.0,351.0,26.0,Rico_15287.xml
-15287.jpg,540,897,edittext,95.0,345.0,351.0,31.0,Rico_15287.xml
+15287.jpg,540,897,inputfield,95.0,523.0,351.0,32.0,Rico_15287.xml
+15287.jpg,540,897,inputfield,95.0,463.0,351.0,32.0,Rico_15287.xml
+15287.jpg,540,897,inputfield,95.0,411.0,351.0,26.0,Rico_15287.xml
+15287.jpg,540,897,inputfield,95.0,345.0,351.0,31.0,Rico_15287.xml
 15287.jpg,540,897,image,22.0,45.0,116.0,39.0,Rico_15287.xml
 15287.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_15287.xml
 20214.jpg,540,897,text,217.0,864.0,105.0,16.0,Rico_20214.xml
@@ -6018,7 +5913,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 27989.jpg,1080,1794,icon,85.0,561.0,48.0,43.0,Rico_27989.xml
 27989.jpg,1080,1794,icon,87.0,412.0,49.0,44.0,Rico_27989.xml
 27989.jpg,1080,1794,icon,87.0,265.0,48.0,37.0,Rico_27989.xml
-27989.jpg,1080,1794,modal,41.0,209.0,998.0,603.0,Rico_27989.xml
 27989.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_27989.xml
 21491.jpg,540,897,pageindicator,209.0,764.0,115.0,17.0,Rico_21491.xml
 21491.jpg,540,897,textbutton,327.0,823.0,200.0,43.0,Rico_21491.xml
@@ -6046,7 +5940,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 56786.jpg,1080,1794,text,348.0,455.0,422.0,85.0,Rico_56786.xml
 56786.jpg,1080,1794,text,179.0,125.0,221.0,39.0,Rico_56786.xml
 56786.jpg,1080,1794,icon,71.0,115.0,44.0,44.0,Rico_56786.xml
-56786.jpg,1080,1794,toolbar,19.0,65.0,1061.0,146.0,Rico_56786.xml
 56786.jpg,1080,1794,uppertaskbar,16.0,1.0,1064.0,63.0,Rico_56786.xml
 14953.jpg,1080,1794,pageindicator,474.0,1546.0,133.0,34.0,Rico_14953.xml
 14953.jpg,1080,1794,textbutton,1.0,1626.0,1079.0,168.0,Rico_14953.xml
@@ -6064,7 +5957,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 64250.jpg,1080,1794,image,196.0,604.0,688.0,166.0,Rico_64250.xml
 64250.jpg,1080,1794,text,280.0,1341.0,521.0,45.0,Rico_64250.xml
 64250.jpg,1080,1794,text,258.0,1406.0,614.0,84.0,Rico_64250.xml
-64250.jpg,1080,1794,checkedtextview,174.0,1406.0,699.0,85.0,Rico_64250.xml
+64250.jpg,1080,1794,checkedview,174.0,1406.0,699.0,85.0,Rico_64250.xml
 64250.jpg,1080,1794,pageindicator,456.0,1545.0,169.0,27.0,Rico_64250.xml
 64250.jpg,1080,1794,textbutton,1.0,1647.0,1079.0,147.0,Rico_64250.xml
 10248.jpg,540,897,text,22.0,719.0,116.0,17.0,Rico_10248.xml
@@ -6116,8 +6009,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 70594.jpg,1080,1794,text,160.0,258.0,119.0,51.0,Rico_70594.xml
 70594.jpg,1080,1794,image,145.0,106.0,49.0,61.0,Rico_70594.xml
 70594.jpg,1080,1794,icon,50.0,114.0,45.0,45.0,Rico_70594.xml
-70594.jpg,1080,1794,toolbar,1.0,64.0,1079.0,146.0,Rico_70594.xml
-70594.jpg,1080,1794,drawer,1.0,210.0,782.0,1584.0,Rico_70594.xml
+70594.jpg,1080,1794,slidingmenu,1.0,210.0,782.0,1584.0,Rico_70594.xml
 70594.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_70594.xml
 13768.jpg,1080,1794,text,953.0,1580.0,21.0,32.0,Rico_13768.xml
 13768.jpg,1080,1794,text,43.0,1577.0,167.0,39.0,Rico_13768.xml
@@ -6147,7 +6039,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 13768.jpg,1080,1794,icon,1003.0,292.0,26.0,37.0,Rico_13768.xml
 13768.jpg,1080,1794,text,458.0,117.0,168.0,54.0,Rico_13768.xml
 13768.jpg,1080,1794,icon,58.0,111.0,32.0,53.0,Rico_13768.xml
-13768.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_13768.xml
 13768.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_13768.xml
 42533.jpg,1080,1794,text,89.0,1043.0,903.0,103.0,Rico_42533.xml
 42533.jpg,1080,1794,pageindicator,459.0,1303.0,163.0,25.0,Rico_42533.xml
@@ -6173,13 +6064,12 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 7676.jpg,1080,1794,text,190.0,753.0,147.0,37.0,Rico_7676.xml
 7676.jpg,1080,1794,text,190.0,627.0,147.0,33.0,Rico_7676.xml
 7676.jpg,1080,1794,text,190.0,500.0,162.0,32.0,Rico_7676.xml
-7676.jpg,1080,1794,drawer,1.0,66.0,840.0,1728.0,Rico_7676.xml
+7676.jpg,1080,1794,slidingmenu,1.0,66.0,840.0,1728.0,Rico_7676.xml
 7676.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_7676.xml
 2929.jpg,540,897,text,238.0,626.0,65.0,21.0,Rico_2929.xml
 2929.jpg,540,897,textbutton,112.0,534.0,316.0,64.0,Rico_2929.xml
 2929.jpg,540,897,text,100.0,414.0,341.0,83.0,Rico_2929.xml
 2929.jpg,540,897,icon,218.0,276.0,105.0,104.0,Rico_2929.xml
-2929.jpg,540,897,modal,61.0,254.0,420.0,421.0,Rico_2929.xml
 2929.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_2929.xml
 29812.jpg,540,897,textbutton,194.0,376.0,153.0,63.0,Rico_29812.xml
 29812.jpg,540,897,icon,366.0,56.0,21.0,24.0,Rico_29812.xml
@@ -6237,27 +6127,26 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 70152.jpg,1080,1794,text,42.0,539.0,242.0,42.0,Rico_70152.xml
 70152.jpg,1080,1794,text,29.0,416.0,331.0,49.0,Rico_70152.xml
 70152.jpg,1080,1794,icon,948.0,248.0,92.0,92.0,Rico_70152.xml
-70152.jpg,1080,1794,edittext,55.0,248.0,880.0,95.0,Rico_70152.xml
+70152.jpg,1080,1794,inputfield,55.0,248.0,880.0,95.0,Rico_70152.xml
 70152.jpg,1080,1794,text,195.0,117.0,184.0,53.0,Rico_70152.xml
 70152.jpg,1080,1794,icon,48.0,119.0,49.0,35.0,Rico_70152.xml
-70152.jpg,1080,1794,toolbar,2.0,65.0,1078.0,143.0,Rico_70152.xml
 70152.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_70152.xml
 65239.jpg,540,897,text,213.0,83.0,114.0,30.0,Rico_65239.xml
 65239.jpg,540,897,textbutton,43.0,317.0,456.0,65.0,Rico_65239.xml
 65239.jpg,540,897,text,259.0,394.0,24.0,20.0,Rico_65239.xml
-65239.jpg,540,897,edittext,47.0,437.0,447.0,28.0,Rico_65239.xml
+65239.jpg,540,897,inputfield,47.0,437.0,447.0,28.0,Rico_65239.xml
 65239.jpg,540,897,text,49.0,437.0,47.0,19.0,Rico_65239.xml
-65239.jpg,540,897,edittext,47.0,492.0,219.0,28.0,Rico_65239.xml
+65239.jpg,540,897,inputfield,47.0,492.0,219.0,28.0,Rico_65239.xml
 65239.jpg,540,897,text,50.0,492.0,91.0,19.0,Rico_65239.xml
-65239.jpg,540,897,edittext,275.0,492.0,219.0,28.0,Rico_65239.xml
+65239.jpg,540,897,inputfield,275.0,492.0,219.0,28.0,Rico_65239.xml
 65239.jpg,540,897,text,277.0,493.0,90.0,18.0,Rico_65239.xml
-65239.jpg,540,897,edittext,47.0,551.0,447.0,32.0,Rico_65239.xml
+65239.jpg,540,897,inputfield,47.0,551.0,447.0,32.0,Rico_65239.xml
 65239.jpg,540,897,text,49.0,552.0,107.0,18.0,Rico_65239.xml
-65239.jpg,540,897,checkedtextview,56.0,611.0,78.0,26.0,Rico_65239.xml
-65239.jpg,540,897,checkedtextview,280.0,611.0,97.0,26.0,Rico_65239.xml
+65239.jpg,540,897,checkedview,56.0,611.0,78.0,26.0,Rico_65239.xml
+65239.jpg,540,897,checkedview,280.0,611.0,97.0,26.0,Rico_65239.xml
 65239.jpg,540,897,text,91.0,614.0,42.0,19.0,Rico_65239.xml
 65239.jpg,540,897,text,313.0,614.0,63.0,19.0,Rico_65239.xml
-65239.jpg,540,897,edittext,47.0,673.0,447.0,28.0,Rico_65239.xml
+65239.jpg,540,897,inputfield,47.0,673.0,447.0,28.0,Rico_65239.xml
 65239.jpg,540,897,text,49.0,674.0,81.0,19.0,Rico_65239.xml
 65239.jpg,540,897,text,130.0,728.0,283.0,44.0,Rico_65239.xml
 65239.jpg,540,897,textbutton,42.0,792.0,457.0,64.0,Rico_65239.xml
@@ -6272,8 +6161,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 12270.jpg,1080,1794,text,225.0,1716.0,102.0,32.0,Rico_12270.xml
 12270.jpg,1080,1794,text,357.0,1297.0,366.0,39.0,Rico_12270.xml
 12270.jpg,1080,1794,textbutton,204.0,1101.0,672.0,129.0,Rico_12270.xml
-12270.jpg,1080,1794,edittext,164.0,926.0,752.0,95.0,Rico_12270.xml
-12270.jpg,1080,1794,edittext,163.0,725.0,753.0,107.0,Rico_12270.xml
+12270.jpg,1080,1794,inputfield,164.0,926.0,752.0,95.0,Rico_12270.xml
+12270.jpg,1080,1794,inputfield,163.0,725.0,753.0,107.0,Rico_12270.xml
 12270.jpg,1080,1794,text,316.0,479.0,449.0,59.0,Rico_12270.xml
 12270.jpg,1080,1794,image,410.0,252.0,260.0,195.0,Rico_12270.xml
 12270.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_12270.xml
@@ -6293,7 +6182,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 32175.jpg,1080,1794,text,185.0,1661.0,241.0,35.0,Rico_32175.xml
 32175.jpg,1080,1794,text,185.0,1713.0,143.0,30.0,Rico_32175.xml
 32175.jpg,1080,1794,icon,646.0,1680.0,25.0,41.0,Rico_32175.xml
-32175.jpg,1080,1794,drawer,1.0,64.0,734.0,1730.0,Rico_32175.xml
+32175.jpg,1080,1794,slidingmenu,1.0,64.0,734.0,1730.0,Rico_32175.xml
 32175.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_32175.xml
 16969.jpg,1080,1794,text,173.0,1108.0,733.0,102.0,Rico_16969.xml
 16969.jpg,1080,1794,textbutton,173.0,1510.0,735.0,127.0,Rico_16969.xml
@@ -6302,7 +6191,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 16969.jpg,1080,1794,text,151.0,121.0,357.0,45.0,Rico_16969.xml
 16969.jpg,1080,1794,text,961.0,121.0,86.0,35.0,Rico_16969.xml
 16969.jpg,1080,1794,icon,53.0,116.0,43.0,43.0,Rico_16969.xml
-16969.jpg,1080,1794,toolbar,1.0,65.0,1079.0,147.0,Rico_16969.xml
 16969.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_16969.xml
 48381.jpg,1080,1794,image,311.0,405.0,457.0,481.0,Rico_48381.xml
 48381.jpg,1080,1794,text,934.0,119.0,105.0,32.0,Rico_48381.xml
@@ -6320,11 +6208,11 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 42690.jpg,1080,1794,image,422.0,324.0,235.0,271.0,Rico_42690.xml
 42690.jpg,1080,1794,pageindicator,436.0,1711.0,210.0,16.0,Rico_42690.xml
 42690.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_42690.xml
-19119.jpg,1080,1794,drawer,1.0,64.0,761.0,1730.0,Rico_19119.xml
+19119.jpg,1080,1794,slidingmenu,1.0,64.0,761.0,1730.0,Rico_19119.xml
 19119.jpg,1080,1794,image,66.0,193.0,134.0,236.0,Rico_19119.xml
 19119.jpg,1080,1794,text,253.0,258.0,453.0,44.0,Rico_19119.xml
 19119.jpg,1080,1794,text,253.0,321.0,469.0,44.0,Rico_19119.xml
-19119.jpg,1080,1794,checkedtextview,49.0,610.0,418.0,50.0,Rico_19119.xml
+19119.jpg,1080,1794,checkedview,49.0,610.0,418.0,50.0,Rico_19119.xml
 19119.jpg,1080,1794,text,190.0,621.0,277.0,33.0,Rico_19119.xml
 19119.jpg,1080,1794,icon,44.0,758.0,58.0,50.0,Rico_19119.xml
 19119.jpg,1080,1794,text,190.0,768.0,207.0,33.0,Rico_19119.xml
@@ -6345,14 +6233,13 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 45882.jpg,540,897,text,22.0,401.0,277.0,22.0,Rico_45882.xml
 45882.jpg,540,897,icon,492.0,851.0,27.0,24.0,Rico_45882.xml
 45882.jpg,540,897,text,23.0,856.0,115.0,20.0,Rico_45882.xml
-45882.jpg,540,897,edittext,19.0,400.0,499.0,32.0,Rico_45882.xml
+45882.jpg,540,897,inputfield,19.0,400.0,499.0,32.0,Rico_45882.xml
 45882.jpg,540,897,text,49.0,294.0,444.0,58.0,Rico_45882.xml
 45882.jpg,540,897,image,358.0,127.0,161.0,139.0,Rico_45882.xml
 45882.jpg,540,897,image,192.0,127.0,162.0,139.0,Rico_45882.xml
 45882.jpg,540,897,image,22.0,126.0,166.0,140.0,Rico_45882.xml
 45882.jpg,540,897,text,95.0,58.0,84.0,28.0,Rico_45882.xml
 45882.jpg,540,897,icon,26.0,58.0,23.0,22.0,Rico_45882.xml
-45882.jpg,540,897,toolbar,1.0,32.0,539.0,74.0,Rico_45882.xml
 45882.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_45882.xml
 70018.jpg,540,897,text,175.0,585.0,192.0,43.0,Rico_70018.xml
 70018.jpg,540,897,text,125.0,657.0,292.0,58.0,Rico_70018.xml
@@ -6363,12 +6250,12 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 15131.jpg,1080,1794,text,56.0,932.0,203.0,40.0,Rico_15131.xml
 15131.jpg,1080,1794,text,56.0,763.0,112.0,40.0,Rico_15131.xml
 15131.jpg,1080,1794,text,55.0,1099.0,418.0,45.0,Rico_15131.xml
-15131.jpg,1080,1794,edittext,32.0,932.0,1022.0,101.0,Rico_15131.xml
+15131.jpg,1080,1794,inputfield,32.0,932.0,1022.0,101.0,Rico_15131.xml
 15131.jpg,1080,1794,text,218.0,607.0,646.0,48.0,Rico_15131.xml
 15131.jpg,1080,1794,text,328.0,147.0,425.0,62.0,Rico_15131.xml
 15131.jpg,1080,1794,text,345.0,1392.0,393.0,43.0,Rico_15131.xml
 15131.jpg,1080,1794,textbutton,21.0,1206.0,1039.0,129.0,Rico_15131.xml
-15131.jpg,1080,1794,edittext,32.0,763.0,1022.0,106.0,Rico_15131.xml
+15131.jpg,1080,1794,inputfield,32.0,763.0,1022.0,106.0,Rico_15131.xml
 15131.jpg,1080,1794,text,520.0,489.0,42.0,29.0,Rico_15131.xml
 15131.jpg,1080,1794,textbutton,21.0,294.0,1039.0,78.0,Rico_15131.xml
 15131.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_15131.xml
@@ -6380,14 +6267,14 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 4143.jpg,1080,1794,text,56.0,741.0,192.0,33.0,Rico_4143.xml
 4143.jpg,1080,1794,text,903.0,106.0,152.0,30.0,Rico_4143.xml
 4143.jpg,1080,1794,textbutton,27.0,1657.0,1028.0,111.0,Rico_4143.xml
-4143.jpg,1080,1794,edittext,553.0,1362.0,501.0,108.0,Rico_4143.xml
-4143.jpg,1080,1794,edittext,27.0,1363.0,501.0,107.0,Rico_4143.xml
-4143.jpg,1080,1794,edittext,27.0,1231.0,1027.0,107.0,Rico_4143.xml
+4143.jpg,1080,1794,inputfield,553.0,1362.0,501.0,108.0,Rico_4143.xml
+4143.jpg,1080,1794,inputfield,27.0,1363.0,501.0,107.0,Rico_4143.xml
+4143.jpg,1080,1794,inputfield,27.0,1231.0,1027.0,107.0,Rico_4143.xml
 4143.jpg,1080,1794,textbutton,553.0,1099.0,502.0,107.0,Rico_4143.xml
 4143.jpg,1080,1794,textbutton,27.0,1099.0,501.0,107.0,Rico_4143.xml
-4143.jpg,1080,1794,edittext,27.0,967.0,1027.0,107.0,Rico_4143.xml
-4143.jpg,1080,1794,edittext,27.0,835.0,1027.0,107.0,Rico_4143.xml
-4143.jpg,1080,1794,edittext,26.0,703.0,1028.0,107.0,Rico_4143.xml
+4143.jpg,1080,1794,inputfield,27.0,967.0,1027.0,107.0,Rico_4143.xml
+4143.jpg,1080,1794,inputfield,27.0,835.0,1027.0,107.0,Rico_4143.xml
+4143.jpg,1080,1794,inputfield,26.0,703.0,1028.0,107.0,Rico_4143.xml
 4143.jpg,1080,1794,text,27.0,657.0,394.0,33.0,Rico_4143.xml
 4143.jpg,1080,1794,text,465.0,592.0,44.0,37.0,Rico_4143.xml
 4143.jpg,1080,1794,text,535.0,595.0,81.0,33.0,Rico_4143.xml
@@ -6395,30 +6282,29 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 4143.jpg,1080,1794,text,240.0,212.0,601.0,43.0,Rico_4143.xml
 4143.jpg,1080,1794,text,28.0,103.0,150.0,42.0,Rico_4143.xml
 4143.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_4143.xml
-10288.jpg,1080,1794,modal,162.0,105.0,757.0,1648.0,Rico_10288.xml
 10288.jpg,1080,1794,icon,53.0,117.0,44.0,43.0,Rico_10288.xml
 10288.jpg,1080,1794,text,228.0,169.0,411.0,63.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,269.0,401.0,56.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,269.0,401.0,56.0,Rico_10288.xml
 10288.jpg,1080,1794,text,352.0,277.0,278.0,43.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,395.0,401.0,56.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,395.0,401.0,56.0,Rico_10288.xml
 10288.jpg,1080,1794,text,352.0,403.0,278.0,43.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,521.0,272.0,61.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,521.0,272.0,61.0,Rico_10288.xml
 10288.jpg,1080,1794,text,351.0,528.0,150.0,54.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,230.0,647.0,380.0,61.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,230.0,647.0,380.0,61.0,Rico_10288.xml
 10288.jpg,1080,1794,text,351.0,655.0,259.0,53.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,230.0,772.0,233.0,56.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,230.0,772.0,233.0,56.0,Rico_10288.xml
 10288.jpg,1080,1794,text,352.0,782.0,111.0,42.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,230.0,899.0,346.0,55.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,230.0,899.0,346.0,55.0,Rico_10288.xml
 10288.jpg,1080,1794,text,355.0,906.0,221.0,44.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,1024.0,425.0,56.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,1024.0,425.0,56.0,Rico_10288.xml
 10288.jpg,1080,1794,text,355.0,1032.0,299.0,44.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,1151.0,376.0,55.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,1151.0,376.0,55.0,Rico_10288.xml
 10288.jpg,1080,1794,text,354.0,1158.0,251.0,44.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,1277.0,434.0,61.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,1277.0,434.0,61.0,Rico_10288.xml
 10288.jpg,1080,1794,text,354.0,1284.0,309.0,54.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,1403.0,327.0,62.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,1403.0,327.0,62.0,Rico_10288.xml
 10288.jpg,1080,1794,text,355.0,1411.0,201.0,54.0,Rico_10288.xml
-10288.jpg,1080,1794,checkedtextview,229.0,1528.0,351.0,63.0,Rico_10288.xml
+10288.jpg,1080,1794,checkedview,229.0,1528.0,351.0,63.0,Rico_10288.xml
 10288.jpg,1080,1794,text,355.0,1536.0,225.0,55.0,Rico_10288.xml
 10288.jpg,1080,1794,text,528.0,1663.0,160.0,34.0,Rico_10288.xml
 10288.jpg,1080,1794,text,776.0,1663.0,56.0,34.0,Rico_10288.xml
@@ -6432,23 +6318,22 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 16809.jpg,540,897,image,1.0,33.0,539.0,499.0,Rico_16809.xml
 16809.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_16809.xml
 21096.jpg,1080,1794,text,215.0,324.0,507.0,52.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.348724,589.141968,339.651276,54.85803199999998,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.348724,589.141968,339.651276,54.85803199999998,Rico_21096.xml
 21096.jpg,1080,1794,text,316.0,599.0,252.0,33.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.0,714.0,388.0,56.0,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.0,714.0,388.0,56.0,Rico_21096.xml
 21096.jpg,1080,1794,text,316.0,725.0,300.0,41.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.0,840.0,307.0,56.0,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.0,840.0,307.0,56.0,Rico_21096.xml
 21096.jpg,1080,1794,text,313.0,851.0,222.0,41.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.0,966.0,224.0,56.0,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.0,966.0,224.0,56.0,Rico_21096.xml
 21096.jpg,1080,1794,text,313.0,977.0,139.0,34.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.0,1092.0,214.0,56.0,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.0,1092.0,214.0,56.0,Rico_21096.xml
 21096.jpg,1080,1794,text,312.0,1103.0,130.0,41.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.0,1218.0,407.0,56.0,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.0,1218.0,407.0,56.0,Rico_21096.xml
 21096.jpg,1080,1794,text,313.0,1228.0,322.0,34.0,Rico_21096.xml
-21096.jpg,1080,1794,checkedtextview,228.0,1344.0,236.0,56.0,Rico_21096.xml
+21096.jpg,1080,1794,checkedview,228.0,1344.0,236.0,56.0,Rico_21096.xml
 21096.jpg,1080,1794,text,312.0,1355.0,152.0,33.0,Rico_21096.xml
 21096.jpg,1080,1794,text,530.0,1524.0,152.0,32.0,Rico_21096.xml
 21096.jpg,1080,1794,text,778.0,1525.0,54.0,31.0,Rico_21096.xml
-21096.jpg,1080,1794,modal,150.0,253.0,782.0,1352.0,Rico_21096.xml
 21096.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_21096.xml
 28924.jpg,540,897,text,142.0,594.0,277.0,41.0,Rico_28924.xml
 28924.jpg,540,897,text,142.0,566.0,166.0,22.0,Rico_28924.xml
@@ -6472,8 +6357,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 28924.jpg,540,897,text,34.0,192.0,146.0,24.0,Rico_28924.xml
 28924.jpg,540,897,image,42.0,561.0,85.0,48.0,Rico_28924.xml
 28924.jpg,540,897,image,12.0,52.0,454.0,119.0,Rico_28924.xml
-28924.jpg,540,897,card,20.0,542.0,427.0,113.0,Rico_28924.xml
-28924.jpg,540,897,drawer,1.0,33.0,465.0,864.0,Rico_28924.xml
+28924.jpg,540,897,slidingmenu,1.0,33.0,465.0,864.0,Rico_28924.xml
 28924.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_28924.xml
 15468.jpg,1080,1794,text,332.0,1145.0,418.0,34.0,Rico_15468.xml
 15468.jpg,1080,1794,text,212.0,1226.0,658.0,37.0,Rico_15468.xml
@@ -6492,7 +6376,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 11632.jpg,1080,1794,image,40.0,262.0,190.0,191.0,Rico_11632.xml
 11632.jpg,1080,1794,text,160.0,117.0,261.0,49.0,Rico_11632.xml
 11632.jpg,1080,1794,icon,51.0,114.0,46.0,46.0,Rico_11632.xml
-11632.jpg,1080,1794,toolbar,1.0,63.0,1079.0,148.0,Rico_11632.xml
 11632.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_11632.xml
 15326.jpg,1080,1794,pageindicator,483.0,1666.0,108.0,19.0,Rico_15326.xml
 15326.jpg,1080,1794,textbutton,265.0,1293.0,551.0,205.0,Rico_15326.xml
@@ -6537,7 +6420,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 6999.jpg,1080,1794,icon,55.0,802.0,40.0,33.0,Rico_6999.xml
 6999.jpg,1080,1794,icon,58.0,672.0,33.0,42.0,Rico_6999.xml
 6999.jpg,1080,1794,image,55.0,548.0,39.0,37.0,Rico_6999.xml
-6999.jpg,1080,1794,drawer,1.0,64.0,912.0,1730.0,Rico_6999.xml
+6999.jpg,1080,1794,slidingmenu,1.0,64.0,912.0,1730.0,Rico_6999.xml
 6999.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_6999.xml
 2447.jpg,1080,1794,textbutton,550.0,1504.0,509.0,127.0,Rico_2447.xml
 2447.jpg,1080,1794,textbutton,22.0,1504.0,509.0,127.0,Rico_2447.xml
@@ -6579,7 +6462,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 63105.jpg,540,897,text,137.0,396.0,208.0,18.0,Rico_63105.xml
 63105.jpg,540,897,text,136.0,311.0,171.0,18.0,Rico_63105.xml
 63105.jpg,540,897,text,136.0,227.0,120.0,20.0,Rico_63105.xml
-63105.jpg,540,897,modal,103.0,193.0,406.0,673.0,Rico_63105.xml
 63105.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_63105.xml
 28879.jpg,1080,1794,image,405.0,604.0,263.0,244.0,Rico_28879.xml
 28879.jpg,1080,1794,icon,919.0,269.0,57.0,54.0,Rico_28879.xml
@@ -6588,7 +6470,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 28879.jpg,1080,1794,textbutton,95.0,1088.0,890.0,127.0,Rico_28879.xml
 28879.jpg,1080,1794,text,98.0,943.0,882.0,90.0,Rico_28879.xml
 28879.jpg,1080,1794,text,298.0,431.0,486.0,65.0,Rico_28879.xml
-28879.jpg,1080,1794,modal,69.0,232.0,943.0,1393.0,Rico_28879.xml
 28879.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_28879.xml
 43955.jpg,1080,1794,textbutton,126.0,1036.0,829.0,112.0,Rico_43955.xml
 43955.jpg,1080,1794,textbutton,126.0,889.0,829.0,117.0,Rico_43955.xml
@@ -6622,7 +6503,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 31479.jpg,540,897,image,104.0,309.0,37.0,70.0,Rico_31479.xml
 31479.jpg,540,897,text,84.0,229.0,342.0,35.0,Rico_31479.xml
 31479.jpg,540,897,text,84.0,159.0,221.0,35.0,Rico_31479.xml
-31479.jpg,540,897,modal,52.0,135.0,438.0,661.0,Rico_31479.xml
 31479.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_31479.xml
 13814.jpg,1080,1794,icon,933.0,1190.0,61.0,67.0,Rico_13814.xml
 13814.jpg,1080,1794,icon,932.0,1583.0,62.0,68.0,Rico_13814.xml
@@ -6646,7 +6526,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 13814.jpg,1080,1794,text,63.0,307.0,192.0,24.0,Rico_13814.xml
 13814.jpg,1080,1794,text,412.0,136.0,255.0,30.0,Rico_13814.xml
 13814.jpg,1080,1794,icon,63.0,126.0,51.0,50.0,Rico_13814.xml
-13814.jpg,1080,1794,toolbar,1.0,64.0,1079.0,172.0,Rico_13814.xml
 13814.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_13814.xml
 62545.jpg,540,897,image,60.0,214.0,421.0,77.0,Rico_62545.xml
 62545.jpg,540,897,textbutton,39.0,546.0,463.0,54.0,Rico_62545.xml
@@ -6667,13 +6546,12 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 4797.jpg,1080,1794,textbutton,43.0,1305.0,995.0,107.0,Rico_4797.xml
 4797.jpg,1080,1794,textbutton,545.0,1175.0,493.0,106.0,Rico_4797.xml
 4797.jpg,1080,1794,textbutton,44.0,1175.0,493.0,106.0,Rico_4797.xml
-4797.jpg,1080,1794,edittext,440.0,938.0,598.0,106.0,Rico_4797.xml
+4797.jpg,1080,1794,inputfield,440.0,938.0,598.0,106.0,Rico_4797.xml
 4797.jpg,1080,1794,image,112.0,632.0,259.0,261.0,Rico_4797.xml
-4797.jpg,1080,1794,edittext,440.0,720.0,598.0,206.0,Rico_4797.xml
-4797.jpg,1080,1794,edittext,440.0,601.0,598.0,107.0,Rico_4797.xml
-4797.jpg,1080,1794,edittext,440.0,484.0,597.0,105.0,Rico_4797.xml
+4797.jpg,1080,1794,inputfield,440.0,720.0,598.0,206.0,Rico_4797.xml
+4797.jpg,1080,1794,inputfield,440.0,601.0,598.0,107.0,Rico_4797.xml
+4797.jpg,1080,1794,inputfield,440.0,484.0,597.0,105.0,Rico_4797.xml
 4797.jpg,1080,1794,text,350.0,379.0,380.0,52.0,Rico_4797.xml
-4797.jpg,1080,1794,modal,16.0,343.0,1047.0,1171.0,Rico_4797.xml
 4797.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_4797.xml
 60408.jpg,1080,1794,text,109.0,900.0,200.0,37.0,Rico_60408.xml
 60408.jpg,1080,1794,text,107.0,747.0,494.0,38.0,Rico_60408.xml
@@ -6681,9 +6559,9 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 60408.jpg,1080,1794,icon,949.0,890.0,60.0,60.0,Rico_60408.xml
 60408.jpg,1080,1794,image,395.0,166.0,290.0,184.0,Rico_60408.xml
 60408.jpg,1080,1794,text,53.0,1003.0,336.0,30.0,Rico_60408.xml
-60408.jpg,1080,1794,edittext,53.0,564.0,976.0,101.0,Rico_60408.xml
-60408.jpg,1080,1794,edittext,53.0,716.0,976.0,101.0,Rico_60408.xml
-60408.jpg,1080,1794,edittext,53.0,868.0,975.0,102.0,Rico_60408.xml
+60408.jpg,1080,1794,inputfield,53.0,564.0,976.0,101.0,Rico_60408.xml
+60408.jpg,1080,1794,inputfield,53.0,716.0,976.0,101.0,Rico_60408.xml
+60408.jpg,1080,1794,inputfield,53.0,868.0,975.0,102.0,Rico_60408.xml
 60408.jpg,1080,1794,textbutton,52.0,1068.0,976.0,101.0,Rico_60408.xml
 60408.jpg,1080,1794,backgroundimage,1.0,63.0,1079.0,1730.0,Rico_60408.xml
 60408.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_60408.xml
@@ -6721,15 +6599,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 29785.jpg,540,897,icon,433.0,56.0,25.0,26.0,Rico_29785.xml
 29785.jpg,540,897,icon,494.0,55.0,28.0,27.0,Rico_29785.xml
 29785.jpg,540,897,icon,25.0,58.0,24.0,24.0,Rico_29785.xml
-29785.jpg,540,897,card,364.0,491.0,169.0,148.0,Rico_29785.xml
-29785.jpg,540,897,card,186.0,489.0,170.0,148.0,Rico_29785.xml
-29785.jpg,540,897,card,10.0,490.0,169.0,147.0,Rico_29785.xml
-29785.jpg,540,897,card,361.0,335.0,169.0,147.0,Rico_29785.xml
-29785.jpg,540,897,card,186.0,335.0,169.0,147.0,Rico_29785.xml
-29785.jpg,540,897,card,10.0,335.0,170.0,147.0,Rico_29785.xml
-29785.jpg,540,897,card,361.0,180.0,169.0,147.0,Rico_29785.xml
-29785.jpg,540,897,card,186.0,181.0,169.0,146.0,Rico_29785.xml
-29785.jpg,540,897,card,10.0,181.0,169.0,146.0,Rico_29785.xml
 29785.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_29785.xml
 20616.jpg,1080,1794,text,245.0,1249.0,242.0,39.0,Rico_20616.xml
 20616.jpg,1080,1794,text,245.0,1058.0,234.0,39.0,Rico_20616.xml
@@ -6745,7 +6614,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 20616.jpg,1080,1794,image,66.0,268.0,57.0,96.0,Rico_20616.xml
 20616.jpg,1080,1794,text,161.0,116.0,424.0,54.0,Rico_20616.xml
 20616.jpg,1080,1794,icon,52.0,115.0,45.0,45.0,Rico_20616.xml
-20616.jpg,1080,1794,toolbar,1.0,65.0,1079.0,148.0,Rico_20616.xml
 20616.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_20616.xml
 34139.jpg,1080,1794,textbutton,171.0,976.0,229.0,38.0,Rico_34139.xml
 34139.jpg,1080,1794,textbutton,635.0,976.0,322.0,35.0,Rico_34139.xml
@@ -6764,30 +6632,29 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 34139.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_34139.xml
 1016.jpg,1080,1794,icon,52.0,116.0,45.0,44.0,Rico_1016.xml
 1016.jpg,1080,1794,text,227.0,169.0,420.0,52.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,229.0,258.0,272.0,55.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,229.0,258.0,272.0,55.0,Rico_1016.xml
 1016.jpg,1080,1794,text,354.0,267.0,147.0,38.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,384.0,272.0,57.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,384.0,272.0,57.0,Rico_1016.xml
 1016.jpg,1080,1794,text,354.0,392.0,148.0,49.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,511.0,301.0,56.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,511.0,301.0,56.0,Rico_1016.xml
 1016.jpg,1080,1794,text,355.0,521.0,176.0,46.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,637.0,339.0,55.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,637.0,339.0,55.0,Rico_1016.xml
 1016.jpg,1080,1794,text,354.0,645.0,215.0,47.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,762.0,287.0,56.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,762.0,287.0,56.0,Rico_1016.xml
 1016.jpg,1080,1794,text,354.0,771.0,163.0,47.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,888.0,292.0,55.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,888.0,292.0,55.0,Rico_1016.xml
 1016.jpg,1080,1794,text,355.0,897.0,167.0,38.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,1014.0,298.0,56.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,1014.0,298.0,56.0,Rico_1016.xml
 1016.jpg,1080,1794,text,354.0,1023.0,174.0,47.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,1140.0,276.0,54.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,1140.0,276.0,54.0,Rico_1016.xml
 1016.jpg,1080,1794,text,355.0,1149.0,150.0,38.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,1266.0,361.0,55.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,1266.0,361.0,55.0,Rico_1016.xml
 1016.jpg,1080,1794,text,354.0,1275.0,236.0,38.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,1391.0,377.0,57.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,1391.0,377.0,57.0,Rico_1016.xml
 1016.jpg,1080,1794,text,351.0,1400.0,256.0,48.0,Rico_1016.xml
-1016.jpg,1080,1794,checkedtextview,230.0,1518.0,263.0,56.0,Rico_1016.xml
+1016.jpg,1080,1794,checkedview,230.0,1518.0,263.0,56.0,Rico_1016.xml
 1016.jpg,1080,1794,text,351.0,1526.0,142.0,48.0,Rico_1016.xml
 1016.jpg,1080,1794,text,702.0,1664.0,141.0,31.0,Rico_1016.xml
-1016.jpg,1080,1794,modal,162.0,105.0,757.0,1648.0,Rico_1016.xml
 1016.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_1016.xml
 31096.jpg,1080,1794,textbutton,53.0,1609.0,475.0,107.0,Rico_31096.xml
 31096.jpg,1080,1794,textbutton,553.0,1610.0,475.0,106.0,Rico_31096.xml
@@ -6813,7 +6680,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 13790.jpg,1080,1794,text,44.0,405.0,462.0,45.0,Rico_13790.xml
 13790.jpg,1080,1794,text,43.0,348.0,216.0,36.0,Rico_13790.xml
 13790.jpg,1080,1794,icon,41.0,126.0,171.0,170.0,Rico_13790.xml
-13790.jpg,1080,1794,drawer,1.0,64.0,810.0,1730.0,Rico_13790.xml
+13790.jpg,1080,1794,slidingmenu,1.0,64.0,810.0,1730.0,Rico_13790.xml
 13790.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_13790.xml
 59100.jpg,1080,1794,text,88.0,871.0,172.0,34.0,Rico_59100.xml
 59100.jpg,1080,1794,text,88.0,725.0,94.0,33.0,Rico_59100.xml
@@ -6823,9 +6690,9 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 59100.jpg,1080,1794,icon,52.0,116.0,45.0,44.0,Rico_59100.xml
 59100.jpg,1080,1794,text,148.0,117.0,239.0,47.0,Rico_59100.xml
 59100.jpg,1080,1794,textbutton,42.0,252.0,997.0,107.0,Rico_59100.xml
-59100.jpg,1080,1794,edittext,42.0,544.0,997.0,107.0,Rico_59100.xml
-59100.jpg,1080,1794,edittext,42.0,691.0,997.0,107.0,Rico_59100.xml
-59100.jpg,1080,1794,edittext,42.0,838.0,997.0,107.0,Rico_59100.xml
+59100.jpg,1080,1794,inputfield,42.0,544.0,997.0,107.0,Rico_59100.xml
+59100.jpg,1080,1794,inputfield,42.0,691.0,997.0,107.0,Rico_59100.xml
+59100.jpg,1080,1794,inputfield,42.0,838.0,997.0,107.0,Rico_59100.xml
 59100.jpg,1080,1794,textbutton,42.0,985.0,997.0,107.0,Rico_59100.xml
 59100.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_59100.xml
 1215.jpg,1080,1794,text,49.0,123.0,389.0,30.0,Rico_1215.xml
@@ -6858,9 +6725,8 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 1215.jpg,1080,1794,text,168.0,247.0,160.0,36.0,Rico_1215.xml
 1215.jpg,1080,1794,text,1.0,254.0,101.0,30.0,Rico_1215.xml
 1215.jpg,1080,1794,icon,1007.0,240.0,41.0,42.0,Rico_1215.xml
-1215.jpg,1080,1794,edittext,26.0,89.0,939.0,97.0,Rico_1215.xml
+1215.jpg,1080,1794,inputfield,26.0,89.0,939.0,97.0,Rico_1215.xml
 1215.jpg,1080,1794,icon,1016.0,115.0,13.0,45.0,Rico_1215.xml
-1215.jpg,1080,1794,bottom_navigation,1.0,1676.0,1079.0,118.0,Rico_1215.xml
 1215.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_1215.xml
 63504.jpg,1080,1794,text,274.0,876.0,535.0,48.0,Rico_63504.xml
 63504.jpg,1080,1794,icon,465.0,643.0,154.0,126.0,Rico_63504.xml
@@ -6891,7 +6757,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 56024.jpg,1080,1794,pageindicator,497.0,1311.0,87.0,25.0,Rico_56024.xml
 56024.jpg,1080,1794,image,463.0,1659.0,153.0,86.0,Rico_56024.xml
 56024.jpg,1080,1794,backgroundimage,1.0,64.0,1079.0,1730.0,Rico_56024.xml
-56024.jpg,1080,1794,card,51.0,188.0,978.0,1079.0,Rico_56024.xml
 56024.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_56024.xml
 37431.jpg,1080,1794,icon,43.0,1525.0,52.0,54.0,Rico_37431.xml
 37431.jpg,1080,1794,image,42.0,1368.0,54.0,54.0,Rico_37431.xml
@@ -6913,7 +6778,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 37431.jpg,1080,1794,text,190.0,436.0,411.0,44.0,Rico_37431.xml
 37431.jpg,1080,1794,text,190.0,281.0,128.0,34.0,Rico_37431.xml
 37431.jpg,1080,1794,text,191.0,123.0,194.0,35.0,Rico_37431.xml
-37431.jpg,1080,1794,drawer,1.0,64.0,735.0,1730.0,Rico_37431.xml
+37431.jpg,1080,1794,slidingmenu,1.0,64.0,735.0,1730.0,Rico_37431.xml
 37431.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_37431.xml
 3210.jpg,1080,1794,icon,890.0,1605.0,149.0,148.0,Rico_3210.xml
 3210.jpg,1080,1794,text,300.0,1311.0,480.0,86.0,Rico_3210.xml
@@ -6921,7 +6786,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 3210.jpg,1080,1794,image,393.0,651.0,372.0,523.0,Rico_3210.xml
 3210.jpg,1080,1794,text,192.0,118.0,226.0,52.0,Rico_3210.xml
 3210.jpg,1080,1794,icon,48.0,118.0,53.0,38.0,Rico_3210.xml
-3210.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_3210.xml
 3210.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_3210.xml
 16953.jpg,1080,1794,text,139.0,1444.0,311.0,48.0,Rico_16953.xml
 16953.jpg,1080,1794,text,139.0,1169.0,523.0,49.0,Rico_16953.xml
@@ -6955,8 +6819,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 16953.jpg,1080,1794,text,46.0,119.0,79.0,41.0,Rico_16953.xml
 16953.jpg,1080,1794,icon,885.0,112.0,56.0,57.0,Rico_16953.xml
 16953.jpg,1080,1794,icon,762.0,104.0,51.0,61.0,Rico_16953.xml
-16953.jpg,1080,1794,bottom_navigation,1.0,1640.0,1079.0,154.0,Rico_16953.xml
-16953.jpg,1080,1794,toolbar,1.0,64.0,1079.0,147.0,Rico_16953.xml
 16953.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_16953.xml
 3212.jpg,1080,1794,text,765.0,1718.0,92.0,29.0,Rico_3212.xml
 3212.jpg,1080,1794,text,230.0,1717.0,81.0,31.0,Rico_3212.xml
@@ -6982,18 +6844,17 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 40730.jpg,540,897,icon,23.0,492.0,28.0,26.0,Rico_40730.xml
 40730.jpg,540,897,image,20.0,352.0,33.0,33.0,Rico_40730.xml
 40730.jpg,540,897,icon,24.0,282.0,25.0,28.0,Rico_40730.xml
-40730.jpg,540,897,drawer,1.0,33.0,393.0,864.0,Rico_40730.xml
+40730.jpg,540,897,slidingmenu,1.0,33.0,393.0,864.0,Rico_40730.xml
 40730.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_40730.xml
 57270.jpg,540,897,text,43.0,705.0,93.0,19.0,Rico_57270.xml
 57270.jpg,540,897,text,43.0,653.0,52.0,18.0,Rico_57270.xml
 57270.jpg,540,897,text,224.0,82.0,93.0,31.0,Rico_57270.xml
 57270.jpg,540,897,textbutton,37.0,526.0,466.0,64.0,Rico_57270.xml
 57270.jpg,540,897,text,259.0,609.0,24.0,19.0,Rico_57270.xml
-57270.jpg,540,897,edittext,42.0,652.0,457.0,28.0,Rico_57270.xml
-57270.jpg,540,897,edittext,42.0,705.0,457.0,31.0,Rico_57270.xml
+57270.jpg,540,897,inputfield,42.0,652.0,457.0,28.0,Rico_57270.xml
+57270.jpg,540,897,inputfield,42.0,705.0,457.0,31.0,Rico_57270.xml
 57270.jpg,540,897,text,211.0,757.0,120.0,20.0,Rico_57270.xml
 57270.jpg,540,897,textbutton,37.0,786.0,467.0,64.0,Rico_57270.xml
-57270.jpg,540,897,card,21.0,510.0,499.0,367.0,Rico_57270.xml
 57270.jpg,540,897,backgroundimage,1.0,33.0,539.0,864.0,Rico_57270.xml
 57270.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_57270.xml
 4019.jpg,1080,1794,textbutton,170.0,801.0,739.0,127.0,Rico_4019.xml
@@ -7002,7 +6863,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 4019.jpg,1080,1794,textbutton,173.0,1240.0,735.0,126.0,Rico_4019.xml
 4019.jpg,1080,1794,textbutton,173.0,1386.0,736.0,126.0,Rico_4019.xml
 4019.jpg,1080,1794,text,203.0,540.0,673.0,211.0,Rico_4019.xml
-4019.jpg,1080,1794,modal,121.0,288.0,839.0,1280.0,Rico_4019.xml
 4019.jpg,1080,1794,icon,437.0,289.0,207.0,211.0,Rico_4019.xml
 4019.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_4019.xml
 62368.jpg,540,897,text,43.0,476.0,208.0,18.0,Rico_62368.xml
@@ -7013,7 +6873,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 62368.jpg,540,897,text,44.0,122.0,128.0,18.0,Rico_62368.xml
 62368.jpg,540,897,text,95.0,53.0,191.0,28.0,Rico_62368.xml
 62368.jpg,540,897,icon,27.0,52.0,22.0,24.0,Rico_62368.xml
-62368.jpg,540,897,toolbar,1.0,33.0,539.0,62.0,Rico_62368.xml
 62368.jpg,540,897,uppertaskbar,1.0,1.0,539.0,26.0,Rico_62368.xml
 15123.jpg,540,897,text,148.0,274.0,245.0,43.0,Rico_15123.xml
 15123.jpg,540,897,text,153.0,581.0,237.0,26.0,Rico_15123.xml
@@ -7028,10 +6887,9 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 23645.jpg,1080,1794,icon,956.0,83.0,60.0,58.0,Rico_23645.xml
 23645.jpg,1080,1794,text,67.0,94.0,215.0,44.0,Rico_23645.xml
 23645.jpg,1080,1794,textbutton,342.0,1113.0,396.0,132.0,Rico_23645.xml
-23645.jpg,1080,1794,edittext,138.0,930.0,805.0,119.0,Rico_23645.xml
-23645.jpg,1080,1794,edittext,133.0,747.0,815.0,119.0,Rico_23645.xml
+23645.jpg,1080,1794,inputfield,138.0,930.0,805.0,119.0,Rico_23645.xml
+23645.jpg,1080,1794,inputfield,133.0,747.0,815.0,119.0,Rico_23645.xml
 23645.jpg,1080,1794,text,124.0,562.0,831.0,104.0,Rico_23645.xml
-23645.jpg,1080,1794,modal,106.0,384.0,868.0,1026.0,Rico_23645.xml
 41567.jpg,540,897,textbutton,279.0,815.0,245.0,66.0,Rico_41567.xml
 41567.jpg,540,897,textbutton,17.0,815.0,245.0,66.0,Rico_41567.xml
 41567.jpg,540,897,image,29.0,177.0,481.0,422.0,Rico_41567.xml
@@ -7043,19 +6901,19 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 57305.jpg,540,897,text,213.0,82.0,115.0,32.0,Rico_57305.xml
 57305.jpg,540,897,textbutton,43.0,317.0,455.0,65.0,Rico_57305.xml
 57305.jpg,540,897,text,259.0,394.0,24.0,20.0,Rico_57305.xml
-57305.jpg,540,897,edittext,47.0,438.0,447.0,27.0,Rico_57305.xml
+57305.jpg,540,897,inputfield,47.0,438.0,447.0,27.0,Rico_57305.xml
 57305.jpg,540,897,text,49.0,439.0,47.0,18.0,Rico_57305.xml
-57305.jpg,540,897,edittext,47.0,492.0,219.0,28.0,Rico_57305.xml
-57305.jpg,540,897,edittext,274.0,492.0,220.0,28.0,Rico_57305.xml
+57305.jpg,540,897,inputfield,47.0,492.0,219.0,28.0,Rico_57305.xml
+57305.jpg,540,897,inputfield,274.0,492.0,220.0,28.0,Rico_57305.xml
 57305.jpg,540,897,text,277.0,492.0,90.0,19.0,Rico_57305.xml
 57305.jpg,540,897,text,49.0,493.0,92.0,18.0,Rico_57305.xml
-57305.jpg,540,897,edittext,47.0,551.0,447.0,32.0,Rico_57305.xml
+57305.jpg,540,897,inputfield,47.0,551.0,447.0,32.0,Rico_57305.xml
 57305.jpg,540,897,text,49.0,551.0,107.0,19.0,Rico_57305.xml
-57305.jpg,540,897,checkedtextview,279.0,612.0,97.0,25.0,Rico_57305.xml
-57305.jpg,540,897,checkedtextview,56.0,611.0,77.0,26.0,Rico_57305.xml
+57305.jpg,540,897,checkedview,279.0,612.0,97.0,25.0,Rico_57305.xml
+57305.jpg,540,897,checkedview,56.0,611.0,77.0,26.0,Rico_57305.xml
 57305.jpg,540,897,text,90.0,614.0,43.0,19.0,Rico_57305.xml
 57305.jpg,540,897,text,313.0,615.0,63.0,19.0,Rico_57305.xml
-57305.jpg,540,897,edittext,47.0,673.0,447.0,28.0,Rico_57305.xml
+57305.jpg,540,897,inputfield,47.0,673.0,447.0,28.0,Rico_57305.xml
 57305.jpg,540,897,text,49.0,674.0,81.0,19.0,Rico_57305.xml
 57305.jpg,540,897,text,130.0,729.0,283.0,43.0,Rico_57305.xml
 57305.jpg,540,897,textbutton,42.0,792.0,456.0,63.0,Rico_57305.xml
@@ -7076,7 +6934,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 2521.jpg,1080,1794,icon,48.0,477.0,53.0,47.0,Rico_2521.xml
 2521.jpg,1080,1794,icon,47.0,600.0,54.0,55.0,Rico_2521.xml
 2521.jpg,1080,1794,icon,47.0,726.0,55.0,54.0,Rico_2521.xml
-2521.jpg,1080,1794,drawer,1.0,64.0,735.0,1730.0,Rico_2521.xml
+2521.jpg,1080,1794,slidingmenu,1.0,64.0,735.0,1730.0,Rico_2521.xml
 2521.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_2521.xml
 6141.jpg,540,897,text,73.0,493.0,395.0,77.0,Rico_6141.xml
 6141.jpg,540,897,text,152.0,64.0,236.0,22.0,Rico_6141.xml
@@ -7110,7 +6968,7 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 65200.jpg,1080,1794,icon,42.0,668.0,49.0,50.0,Rico_65200.xml
 65200.jpg,1080,1794,icon,41.0,543.0,50.0,51.0,Rico_65200.xml
 65200.jpg,1080,1794,icon,42.0,417.0,49.0,49.0,Rico_65200.xml
-65200.jpg,1080,1794,drawer,1.0,62.0,788.0,1731.0,Rico_65200.xml
+65200.jpg,1080,1794,slidingmenu,1.0,62.0,788.0,1731.0,Rico_65200.xml
 65200.jpg,1080,1794,uppertaskbar,1.0,1.0,1079.0,63.0,Rico_65200.xml
 29750.jpg,540,897,text,68.0,93.0,66.0,20.0,Rico_29750.xml
 29750.jpg,540,897,text,139.0,547.0,79.0,15.0,Rico_29750.xml
@@ -7132,7 +6990,6 @@ Android_50.jpg,720,1280,uppertaskbar,1.0,1.0,719.0,42.0,Android_Android_50.xml
 29750.jpg,540,897,text,115.0,245.0,129.0,15.0,Rico_29750.xml
 29750.jpg,540,897,icon,147.0,167.0,64.0,63.0,Rico_29750.xml
 29750.jpg,540,897,image,352.0,171.0,60.0,56.0,Rico_29750.xml
-29750.jpg,540,897,modal,35.0,53.0,470.0,823.0,Rico_29750.xml
 29750.jpg,540,897,uppertaskbar,1.0,1.0,539.0,32.0,Rico_29750.xml
 34265.jpg,1080,1794,image,370.0,1039.0,340.0,339.0,Rico_34265.xml
 34265.jpg,1080,1794,text,146.0,684.0,791.0,106.0,Rico_34265.xml
@@ -7198,7 +7055,7 @@ IMG_8650.jpg,1242,2208,icon,337.0,2066.0,73.0,65.0,iphone_IMG_865085.xml
 IMG_8650.jpg,1242,2208,image,589.0,2062.0,65.0,71.0,iphone_IMG_865085.xml
 IMG_8650.jpg,1242,2208,icon,835.0,2063.0,68.0,67.0,iphone_IMG_865085.xml
 IMG_8650.jpg,1242,2208,icon,1081.0,2060.0,74.0,74.0,iphone_IMG_865085.xml
-IMG_8650.jpg,1242,2208,edittext,71.0,90.0,1102.0,146.0,iphone_IMG_865085.xml
+IMG_8650.jpg,1242,2208,inputfield,71.0,90.0,1102.0,146.0,iphone_IMG_865085.xml
 IMG_8650.jpg,1242,2208,textbutton,70.0,278.0,242.0,128.0,iphone_IMG_865085.xml
 IMG_8650.jpg,1242,2208,textbutton,339.0,279.0,265.0,128.0,iphone_IMG_865085.xml
 IMG_8650.jpg,1242,2208,textbutton,632.0,279.0,245.0,128.0,iphone_IMG_865085.xml
@@ -7233,7 +7090,7 @@ IMG_3050.jpg,1242,2208,text,580.0,2155.0,82.0,24.0,iphone_IMG_3050.xml
 IMG_3050.jpg,1242,2208,text,824.0,2155.0,93.0,25.0,iphone_IMG_3050.xml
 IMG_3050.jpg,1242,2208,text,1059.0,2155.0,118.0,24.0,iphone_IMG_3050.xml
 IMG_3050.jpg,1242,2208,image,72.0,402.0,1099.0,1319.0,iphone_IMG_3050.xml
-IMG_3050.jpg,1242,2208,edittext,72.0,90.0,1101.0,145.0,iphone_IMG_3050.xml
+IMG_3050.jpg,1242,2208,inputfield,72.0,90.0,1101.0,145.0,iphone_IMG_3050.xml
 IMG_3050.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3050.xml
 IMG_912184.jpg,1242,2208,icon,151.0,735.0,51.0,64.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,icon,151.0,900.0,54.0,64.0,iphone_IMG_912184.xml
@@ -7245,8 +7102,8 @@ IMG_912184.jpg,1242,2208,text,288.0,521.0,178.0,49.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,text,799.0,521.0,123.0,49.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,text,836.0,1253.0,299.0,40.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,text,524.0,1399.0,195.0,33.0,iphone_IMG_912184.xml
-IMG_912184.jpg,1242,2208,edittext,105.0,699.0,1032.0,136.0,iphone_IMG_912184.xml
-IMG_912184.jpg,1242,2208,edittext,105.0,864.0,1032.0,136.0,iphone_IMG_912184.xml
+IMG_912184.jpg,1242,2208,inputfield,105.0,699.0,1032.0,136.0,iphone_IMG_912184.xml
+IMG_912184.jpg,1242,2208,inputfield,105.0,864.0,1032.0,136.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,textbutton,105.0,1060.0,1032.0,135.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,textbutton,105.0,1486.0,487.0,135.0,iphone_IMG_912184.xml
 IMG_912184.jpg,1242,2208,textbutton,651.0,1486.0,487.0,136.0,iphone_IMG_912184.xml
@@ -7254,7 +7111,7 @@ IMG_912184.jpg,1242,2208,image,1.0,1.0,1241.0,621.0,iphone_IMG_912184.xml
 IMG_9007.jpg,1242,2208,text,357.0,110.0,525.0,34.0,iphone_IMG_900755.xml
 IMG_9007.jpg,1242,2208,icon,72.0,109.0,35.0,36.0,iphone_IMG_900755.xml
 IMG_9007.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_900755.xml
-IMG_9007.jpg,1242,2208,edittext,37.0,75.0,1170.0,104.0,iphone_IMG_900755.xml
+IMG_9007.jpg,1242,2208,inputfield,37.0,75.0,1170.0,104.0,iphone_IMG_900755.xml
 IMG_9007.jpg,1242,2208,text,134.0,298.0,393.0,29.0,iphone_IMG_900755.xml
 IMG_9007.jpg,1242,2208,text,717.0,299.0,375.0,28.0,iphone_IMG_900755.xml
 IMG_9007.jpg,1242,2208,text,48.0,1624.0,1049.0,239.0,iphone_IMG_900755.xml
@@ -7318,7 +7175,7 @@ IMG_907947.jpg,1242,2208,icon,336.0,2079.0,74.0,66.0,iphone_IMG_907947.xml
 IMG_907947.jpg,1242,2208,icon,582.0,2075.0,76.0,76.0,iphone_IMG_907947.xml
 IMG_907947.jpg,1242,2208,icon,838.0,2075.0,63.0,78.0,iphone_IMG_907947.xml
 IMG_907947.jpg,1242,2208,icon,1085.0,2078.0,62.0,75.0,iphone_IMG_907947.xml
-IMG_907947.jpg,1242,2208,edittext,46.0,84.0,954.0,151.0,iphone_IMG_907947.xml
+IMG_907947.jpg,1242,2208,inputfield,46.0,84.0,954.0,151.0,iphone_IMG_907947.xml
 IMG_907947.jpg,1242,2208,textbutton,46.0,303.0,554.0,97.0,iphone_IMG_907947.xml
 IMG_907947.jpg,1242,2208,textbutton,644.0,303.0,553.0,97.0,iphone_IMG_907947.xml
 IMG_907947.jpg,1242,2208,image,45.0,489.0,554.0,738.0,iphone_IMG_907947.xml
@@ -7418,14 +7275,14 @@ IMG_9009.jpg,1242,2208,image,49.0,398.0,1145.0,1146.0,iphone_IMG_900975.xml
 IMG_9009.jpg,1242,2208,text,717.0,299.0,374.0,28.0,iphone_IMG_900975.xml
 IMG_9009.jpg,1242,2208,text,134.0,300.0,393.0,27.0,iphone_IMG_900975.xml
 IMG_9009.jpg,1242,2208,icon,72.0,110.0,34.0,34.0,iphone_IMG_900975.xml
-IMG_9009.jpg,1242,2208,edittext,36.0,75.0,1170.0,103.0,iphone_IMG_900975.xml
+IMG_9009.jpg,1242,2208,inputfield,36.0,75.0,1170.0,103.0,iphone_IMG_900975.xml
 IMG_9009.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_900975.xml
 IMG_3533.jpg,1242,2208,text,341.0,254.0,86.0,28.0,iphone_IMG_3533.xml
 IMG_3533.jpg,1242,2208,text,341.0,376.0,163.0,27.0,iphone_IMG_3533.xml
 IMG_3533.jpg,1242,2208,text,341.0,495.0,154.0,29.0,iphone_IMG_3533.xml
-IMG_3533.jpg,1242,2208,edittext,315.0,462.0,898.0,91.0,iphone_IMG_3533.xml
-IMG_3533.jpg,1242,2208,edittext,315.0,342.0,898.0,92.0,iphone_IMG_3533.xml
-IMG_3533.jpg,1242,2208,edittext,315.0,222.0,898.0,91.0,iphone_IMG_3533.xml
+IMG_3533.jpg,1242,2208,inputfield,315.0,462.0,898.0,91.0,iphone_IMG_3533.xml
+IMG_3533.jpg,1242,2208,inputfield,315.0,342.0,898.0,92.0,iphone_IMG_3533.xml
+IMG_3533.jpg,1242,2208,inputfield,315.0,222.0,898.0,91.0,iphone_IMG_3533.xml
 IMG_3533.jpg,1242,2208,image,381.0,72.0,482.0,109.0,iphone_IMG_3533.xml
 IMG_3533.jpg,1242,2208,icon,39.0,96.0,37.0,63.0,iphone_IMG_3533.xml
 IMG_3533.jpg,1242,2208,text,167.0,248.0,131.0,40.0,iphone_IMG_3533.xml
@@ -7454,7 +7311,7 @@ IMG_9105.jpg,1242,2208,icon,1019.0,1267.0,50.0,50.0,iphone_IMG_910569.xml
 IMG_9105.jpg,1242,2208,icon,1139.0,1271.0,50.0,44.0,iphone_IMG_910569.xml
 IMG_9105.jpg,1242,2208,icon,1019.0,1699.0,50.0,50.0,iphone_IMG_910569.xml
 IMG_9105.jpg,1242,2208,icon,1139.0,1702.0,50.0,44.0,iphone_IMG_910569.xml
-IMG_9105.jpg,1242,2208,edittext,24.0,194.0,1195.0,114.0,iphone_IMG_910569.xml
+IMG_9105.jpg,1242,2208,inputfield,24.0,194.0,1195.0,114.0,iphone_IMG_910569.xml
 IMG_9105.jpg,1242,2208,textbutton,850.0,377.0,199.0,110.0,iphone_IMG_910569.xml
 IMG_9105.jpg,1242,2208,text,397.0,560.0,402.0,42.0,iphone_IMG_910569.xml
 IMG_9105.jpg,1242,2208,text,400.0,647.0,766.0,137.0,iphone_IMG_910569.xml
@@ -7494,8 +7351,8 @@ IMG_5745.jpg,1242,2688,text,553.28418,180.58754,138.36621100000002,47.46965,ipho
 IMG_5745.jpg,1242,2688,text,97.613106,178.722626,109.367485,39.309799,iphone_IMG_5745.xml
 IMG_5745.jpg,1242,2688,icon,39.0,167.76712,37.100876,63.23288,iphone_IMG_5745.xml
 IMG_5745.jpg,1242,2688,uppertaskbar,114.0,49.566086,1063.299805,38.433914,iphone_IMG_5745.xml
-IMG_5745.jpg,1242,2688,edittext,45.917999,607.536743,1151.17685,62.28094499999997,iphone_IMG_5745.xml
-IMG_5745.jpg,1242,2688,edittext,45.908504,808.413269,1151.190129,64.296875,iphone_IMG_5745.xml
+IMG_5745.jpg,1242,2688,inputfield,45.917999,607.536743,1151.17685,62.28094499999997,iphone_IMG_5745.xml
+IMG_5745.jpg,1242,2688,inputfield,45.908504,808.413269,1151.190129,64.296875,iphone_IMG_5745.xml
 IMG_5745.jpg,1242,2688,textbutton,45.493717,1163.062012,1151.847836,151.04955999999993,iphone_IMG_5745.xml
 IMG_2758.jpg,1242,2208,text,96.0,2069.0,293.0,43.0,iphone_IMG_2758.xml
 IMG_2758.jpg,1242,2208,pageindicator,97.0,1975.0,229.0,14.0,iphone_IMG_2758.xml
@@ -7541,7 +7398,7 @@ IMG_3693.jpg,1242,2208,textbutton,392.0,1344.0,182.0,92.0,iphone_IMG_3693.xml
 IMG_3693.jpg,1242,2208,textbutton,1015.0,1344.0,182.0,92.0,iphone_IMG_3693.xml
 IMG_3693.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3693.xml
 IMG_5194.jpg,1242,2208,text,178.0,825.0,200.0,37.0,iphone_IMG_5194.xml
-IMG_5194.jpg,1242,2208,edittext,60.0,768.0,1123.0,152.0,iphone_IMG_5194.xml
+IMG_5194.jpg,1242,2208,inputfield,60.0,768.0,1123.0,152.0,iphone_IMG_5194.xml
 IMG_5194.jpg,1242,2208,text,548.0,106.0,145.0,41.0,iphone_IMG_5194.xml
 IMG_5194.jpg,1242,2208,text,1080.0,112.0,101.0,35.0,iphone_IMG_5194.xml
 IMG_5194.jpg,1242,2208,text,64.0,112.0,108.0,35.0,iphone_IMG_5194.xml
@@ -7585,8 +7442,8 @@ IMG_9948.jpg,1242,2208,textbutton,49.0,1082.0,1145.0,131.0,iphone_IMG_9948.xml
 IMG_9948.jpg,1242,2208,icon,96.842896,952.430969,65.0,28.25793499999997,iphone_IMG_9948.xml
 IMG_9948.jpg,1242,2208,icon,105.857948,792.551575,48.14205200000001,36.13153,iphone_IMG_9948.xml
 IMG_9948.jpg,1242,2208,text,1007.0,951.0,134.0,39.0,iphone_IMG_9948.xml
-IMG_9948.jpg,1242,2208,edittext,48.794659,900.453735,1145.392597,132.23339899999996,iphone_IMG_9948.xml
-IMG_9948.jpg,1242,2208,edittext,48.741058,744.527283,1145.435334,132.224426,iphone_IMG_9948.xml
+IMG_9948.jpg,1242,2208,inputfield,48.794659,900.453735,1145.392597,132.23339899999996,iphone_IMG_9948.xml
+IMG_9948.jpg,1242,2208,inputfield,48.741058,744.527283,1145.435334,132.224426,iphone_IMG_9948.xml
 IMG_9948.jpg,1242,2208,text,603.342468,676.454224,37.39013699999998,24.33813400000008,iphone_IMG_9948.xml
 IMG_9948.jpg,1242,2208,text,442.2789,184.504181,356.711334,39.49581900000001,iphone_IMG_9948.xml
 IMG_9948.jpg,1242,2208,icon,75.0,183.0,44.0,44.0,iphone_IMG_9948.xml
@@ -7692,8 +7549,8 @@ IMG_9109.jpg,1242,2208,icon,1122.0,112.0,81.0,60.0,iphone_IMG_910999.xml
 IMG_9109.jpg,1242,2208,icon,140.0,1029.0,62.0,57.0,iphone_IMG_910999.xml
 IMG_9109.jpg,1242,2208,image,146.0,1183.0,51.0,59.0,iphone_IMG_910999.xml
 IMG_9109.jpg,1242,2208,image,298.0,301.0,633.0,358.0,iphone_IMG_910999.xml
-IMG_9109.jpg,1242,2208,edittext,243.0,1040.0,850.0,71.0,iphone_IMG_910999.xml
-IMG_9109.jpg,1242,2208,edittext,242.0,1190.0,851.0,71.0,iphone_IMG_910999.xml
+IMG_9109.jpg,1242,2208,inputfield,243.0,1040.0,850.0,71.0,iphone_IMG_910999.xml
+IMG_9109.jpg,1242,2208,inputfield,242.0,1190.0,851.0,71.0,iphone_IMG_910999.xml
 IMG_9109.jpg,1242,2208,textbutton,66.0,1840.0,1115.0,137.0,iphone_IMG_910999.xml
 IMG_9109.jpg,1242,2208,text,259.0,2067.0,129.0,42.0,iphone_IMG_910999.xml
 IMG_9109.jpg,1242,2208,text,769.0,2066.0,298.0,44.0,iphone_IMG_910999.xml
@@ -7711,14 +7568,14 @@ IMG_3727.jpg,1242,2208,text,886.0,1209.0,306.0,42.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,text,50.0,1362.0,257.0,39.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,text,49.0,1211.0,234.0,39.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,text,51.0,1091.0,1119.0,36.0,iphone_IMG_3727.xml
-IMG_3727.jpg,1242,2208,edittext,49.0,1016.0,1146.0,58.0,iphone_IMG_3727.xml
-IMG_3727.jpg,1242,2208,edittext,49.0,865.0,1146.0,58.0,iphone_IMG_3727.xml
+IMG_3727.jpg,1242,2208,inputfield,49.0,1016.0,1146.0,58.0,iphone_IMG_3727.xml
+IMG_3727.jpg,1242,2208,inputfield,49.0,865.0,1146.0,58.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,icon,447.0,613.0,90.0,90.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,icon,52.0,612.0,90.0,91.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,text,169.0,644.0,103.0,29.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,text,564.0,644.0,146.0,29.0,iphone_IMG_3727.xml
-IMG_3727.jpg,1242,2208,edittext,366.0,322.0,829.0,59.0,iphone_IMG_3727.xml
-IMG_3727.jpg,1242,2208,edittext,366.0,464.0,829.0,59.0,iphone_IMG_3727.xml
+IMG_3727.jpg,1242,2208,inputfield,366.0,322.0,829.0,59.0,iphone_IMG_3727.xml
+IMG_3727.jpg,1242,2208,inputfield,366.0,464.0,829.0,59.0,iphone_IMG_3727.xml
 IMG_3727.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3727.xml
 IMG_3243.jpg,1242,2208,image,307.0,336.0,622.0,493.0,iphone_IMG_3243.xml
 IMG_3243.jpg,1242,2208,text,278.0,975.0,686.0,76.0,iphone_IMG_3243.xml
@@ -7733,11 +7590,11 @@ IMG_3525.jpg,1242,2208,text,220.0,1389.0,231.0,38.0,iphone_IMG_3525.xml
 IMG_3525.jpg,1242,2208,text,220.0,1177.0,116.0,39.0,iphone_IMG_3525.xml
 IMG_3525.jpg,1242,2208,text,221.0,969.0,232.0,38.0,iphone_IMG_3525.xml
 IMG_3525.jpg,1242,2208,text,220.0,757.0,235.0,40.0,iphone_IMG_3525.xml
-IMG_3525.jpg,1242,2208,edittext,216.0,1597.0,811.0,80.0,iphone_IMG_3525.xml
-IMG_3525.jpg,1242,2208,edittext,217.0,1389.0,810.0,78.0,iphone_IMG_3525.xml
-IMG_3525.jpg,1242,2208,edittext,216.0,1176.0,811.0,81.0,iphone_IMG_3525.xml
-IMG_3525.jpg,1242,2208,edittext,216.0,969.0,811.0,78.0,iphone_IMG_3525.xml
-IMG_3525.jpg,1242,2208,edittext,216.0,756.0,811.0,81.0,iphone_IMG_3525.xml
+IMG_3525.jpg,1242,2208,inputfield,216.0,1597.0,811.0,80.0,iphone_IMG_3525.xml
+IMG_3525.jpg,1242,2208,inputfield,217.0,1389.0,810.0,78.0,iphone_IMG_3525.xml
+IMG_3525.jpg,1242,2208,inputfield,216.0,1176.0,811.0,81.0,iphone_IMG_3525.xml
+IMG_3525.jpg,1242,2208,inputfield,216.0,969.0,811.0,78.0,iphone_IMG_3525.xml
+IMG_3525.jpg,1242,2208,inputfield,216.0,756.0,811.0,81.0,iphone_IMG_3525.xml
 IMG_3525.jpg,1242,2208,text,92.0,115.0,98.0,32.0,iphone_IMG_3525.xml
 IMG_3525.jpg,1242,2208,image,303.0,238.0,637.0,237.0,iphone_IMG_3525.xml
 IMG_3525.jpg,1242,2208,text,190.0,529.0,860.0,59.0,iphone_IMG_3525.xml
@@ -7766,7 +7623,6 @@ IMG_2607.jpg,1242,2208,image,834.0,713.0,331.0,331.0,iphone_IMG_2607.xml
 IMG_2607.jpg,1242,2208,image,78.0,1157.0,331.0,331.0,iphone_IMG_2607.xml
 IMG_2607.jpg,1242,2208,image,456.0,1157.0,331.0,331.0,iphone_IMG_2607.xml
 IMG_2607.jpg,1242,2208,image,834.0,1157.0,331.0,331.0,iphone_IMG_2607.xml
-IMG_2607.jpg,1242,2208,modal,30.0,441.0,1182.0,1329.0,iphone_IMG_2607.xml
 IMG_2607.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_2607.xml
 IMG_9022.jpg,1242,2208,image,170.0,569.0,904.0,1006.0,iphone_IMG_902281.xml
 IMG_9022.jpg,1242,2208,textbutton,120.0,1928.0,1002.0,185.0,iphone_IMG_902281.xml
@@ -7795,7 +7651,7 @@ IMG_863125.jpg,1242,2208,image,72.0,729.0,1098.0,733.0,iphone_IMG_863125.xml
 IMG_863125.jpg,1242,2208,text,73.0,541.0,916.0,113.0,iphone_IMG_863125.xml
 IMG_863125.jpg,1242,2208,text,76.0,354.0,981.0,153.0,iphone_IMG_863125.xml
 IMG_863125.jpg,1242,2208,icon,130.0,140.0,46.0,46.0,iphone_IMG_863125.xml
-IMG_863125.jpg,1242,2208,edittext,71.0,91.0,1101.0,144.0,iphone_IMG_863125.xml
+IMG_863125.jpg,1242,2208,inputfield,71.0,91.0,1101.0,144.0,iphone_IMG_863125.xml
 IMG_863125.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_863125.xml
 IMG_1547.jpg,1242,2208,text,64.770035,943.358582,158.215439,40.458740000000034,iphone_IMG_1547.xml
 IMG_1547.jpg,1242,2208,text,64.746101,763.40625,93.213768,40.39349400000003,iphone_IMG_1547.xml
@@ -7803,10 +7659,10 @@ IMG_1547.jpg,1242,2208,text,64.398766,583.674194,121.65229,40.65960699999994,iph
 IMG_1547.jpg,1242,2208,text,63.653,406.491852,178.293823,37.77899200000002,iphone_IMG_1547.xml
 IMG_1547.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_1547.xml
 IMG_1547.jpg,1242,2208,text,518.411804,95.683899,205.181458,73.656586,iphone_IMG_1547.xml
-IMG_1547.jpg,1242,2208,edittext,60.888271,583.671631,1121.217076,59.09381099999996,iphone_IMG_1547.xml
-IMG_1547.jpg,1242,2208,edittext,60.853699,405.84317,1121.258606,57.04031400000002,iphone_IMG_1547.xml
-IMG_1547.jpg,1242,2208,edittext,60.899281,943.367981,1121.200817,59.24237100000005,iphone_IMG_1547.xml
-IMG_1547.jpg,1242,2208,edittext,60.874157,763.426941,1121.251331,59.278503,iphone_IMG_1547.xml
+IMG_1547.jpg,1242,2208,inputfield,60.888271,583.671631,1121.217076,59.09381099999996,iphone_IMG_1547.xml
+IMG_1547.jpg,1242,2208,inputfield,60.853699,405.84317,1121.258606,57.04031400000002,iphone_IMG_1547.xml
+IMG_1547.jpg,1242,2208,inputfield,60.899281,943.367981,1121.200817,59.24237100000005,iphone_IMG_1547.xml
+IMG_1547.jpg,1242,2208,inputfield,60.874157,763.426941,1121.251331,59.278503,iphone_IMG_1547.xml
 IMG_1547.jpg,1242,2208,textbutton,60.16774,1166.377563,1122.267563,152.001221,iphone_IMG_1547.xml
 IMG_1547.jpg,1242,2208,text,342.376709,1388.017456,395.447327,46.57556199999999,iphone_IMG_1547.xml
 IMG_1547.jpg,1242,2208,text,754.035461,1382.978516,142.63671899999997,52.0214840000001,iphone_IMG_1547.xml
@@ -7871,13 +7727,12 @@ IMG_3345.jpg,1242,2208,icon,1052.0,99.0,62.0,59.0,iphone_IMG_3345.xml
 IMG_3345.jpg,1242,2208,image,898.0,96.0,61.0,62.0,iphone_IMG_3345.xml
 IMG_3345.jpg,1242,2208,icon,114.0,110.0,32.0,31.0,iphone_IMG_3345.xml
 IMG_3345.jpg,1242,2208,image,100.0,369.0,180.0,295.0,iphone_IMG_3345.xml
-IMG_3345.jpg,1242,2208,edittext,85.0,73.0,900.0,109.0,iphone_IMG_3345.xml
+IMG_3345.jpg,1242,2208,inputfield,85.0,73.0,900.0,109.0,iphone_IMG_3345.xml
 IMG_3345.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3345.xml
 IMG_3812.jpg,1242,2208,textbutton,705.0,1289.0,394.0,97.0,iphone_IMG_3812.xml
 IMG_3812.jpg,1242,2208,textbutton,380.0,1289.0,278.0,97.0,iphone_IMG_3812.xml
 IMG_3812.jpg,1242,2208,text,145.0,1094.0,911.0,97.0,iphone_IMG_3812.xml
 IMG_3812.jpg,1242,2208,text,144.0,876.0,638.0,157.0,iphone_IMG_3812.xml
-IMG_3812.jpg,1242,2208,modal,48.0,727.0,1147.0,755.0,iphone_IMG_3812.xml
 IMG_3812.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3812.xml
 IMG_9025.jpg,1242,2208,image,1059.0,2085.0,183.0,123.0,iphone_IMG_902531.xml
 IMG_9025.jpg,1242,2208,image,555.0,2085.0,474.0,123.0,iphone_IMG_902531.xml
@@ -7912,9 +7767,9 @@ IMG_3796.jpg,1242,2208,backgroundimage,1.0,1.0,1241.0,2207.0,iphone_IMG_3796.xml
 IMG_3769.jpg,1242,2208,text,94.0,789.0,207.0,42.0,iphone_IMG_3769.xml
 IMG_3769.jpg,1242,2208,text,94.0,584.0,114.0,40.0,iphone_IMG_3769.xml
 IMG_3769.jpg,1242,2208,text,93.0,381.0,129.0,39.0,iphone_IMG_3769.xml
-IMG_3769.jpg,1242,2208,edittext,90.0,789.0,1063.0,89.0,iphone_IMG_3769.xml
-IMG_3769.jpg,1242,2208,edittext,90.0,583.0,1063.0,88.0,iphone_IMG_3769.xml
-IMG_3769.jpg,1242,2208,edittext,90.0,381.0,1063.0,83.0,iphone_IMG_3769.xml
+IMG_3769.jpg,1242,2208,inputfield,90.0,789.0,1063.0,89.0,iphone_IMG_3769.xml
+IMG_3769.jpg,1242,2208,inputfield,90.0,583.0,1063.0,88.0,iphone_IMG_3769.xml
+IMG_3769.jpg,1242,2208,inputfield,90.0,381.0,1063.0,83.0,iphone_IMG_3769.xml
 IMG_3769.jpg,1242,2208,text,246.0,1962.0,752.0,36.0,iphone_IMG_3769.xml
 IMG_3769.jpg,1242,2208,text,353.0,1919.0,535.0,35.0,iphone_IMG_3769.xml
 IMG_3769.jpg,1242,2208,text,596.0,1249.0,51.0,29.0,iphone_IMG_3769.xml
@@ -7926,31 +7781,30 @@ IMG_3769.jpg,1242,2208,icon,27.0,118.0,39.0,65.0,iphone_IMG_3769.xml
 IMG_3769.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3769.xml
 IMG_1630.jpg,1242,2208,textbutton,31.0,1881.0,1181.0,150.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,216.0,1812.0,408.0,43.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,1805.0,504.0,51.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,1805.0,504.0,51.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,217.0,1680.0,114.0,35.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,1674.0,211.0,49.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,1674.0,211.0,49.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,218.0,1548.0,258.0,43.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkbox,121.0,1542.0,48.0,48.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,218.0,1416.0,183.0,46.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,1409.0,280.0,54.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,1409.0,280.0,54.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,218.0,1284.0,253.0,35.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,1278.0,351.0,49.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,1278.0,351.0,49.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,218.0,1153.0,564.0,42.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,1146.0,663.0,50.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,1146.0,663.0,50.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,icon,1136.0,1035.0,32.0,8.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,155.0,1023.0,61.0,33.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,61.0,1014.0,155.0,49.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,61.0,1014.0,155.0,49.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,216.0,890.0,107.0,41.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,882.0,203.0,49.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,882.0,203.0,49.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,218.0,757.0,136.0,35.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,121.0,750.0,233.0,50.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,121.0,750.0,233.0,50.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,218.0,625.0,165.0,35.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,618.0,263.0,49.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,618.0,263.0,49.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,215.0,493.0,246.0,35.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,120.0,486.0,341.0,49.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,120.0,486.0,341.0,49.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,icon,1136.0,375.0,32.0,8.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,156.0,362.0,175.0,34.0,iphone_IMG_1630.xml
-IMG_1630.jpg,1242,2208,checkedtextview,60.0,354.0,271.0,50.0,iphone_IMG_1630.xml
+IMG_1630.jpg,1242,2208,checkedview,60.0,354.0,271.0,50.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,262.0,243.0,150.0,33.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,48.0,242.0,195.0,42.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,icon,61.0,108.0,57.0,37.0,iphone_IMG_1630.xml
@@ -7967,7 +7821,7 @@ IMG_1630.jpg,1242,2208,text,337.0,2173.0,73.0,29.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,text,84.0,2174.0,83.0,23.0,iphone_IMG_1630.xml
 IMG_1630.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_1630.xml
 IMG_2649.jpg,1242,2208,text,58.0,1398.0,345.0,41.0,iphone_IMG_2649.xml
-IMG_2649.jpg,1242,2208,edittext,54.0,1398.0,1135.0,67.0,iphone_IMG_2649.xml
+IMG_2649.jpg,1242,2208,inputfield,54.0,1398.0,1135.0,67.0,iphone_IMG_2649.xml
 IMG_2649.jpg,1242,2208,image,445.0,266.0,354.0,154.0,iphone_IMG_2649.xml
 IMG_2649.jpg,1242,2208,text,57.0,1480.0,146.0,39.0,iphone_IMG_2649.xml
 IMG_2649.jpg,1242,2208,text,54.0,1545.0,1055.0,110.0,iphone_IMG_2649.xml
@@ -7988,13 +7842,13 @@ IMG_3543.jpg,1242,2208,text,120.0,243.0,484.0,42.0,iphone_IMG_3543.xml
 IMG_3543.jpg,1242,2208,icon,60.0,99.0,53.0,53.0,iphone_IMG_3543.xml
 IMG_3543.jpg,1242,2208,icon,1063.0,1716.0,60.0,34.0,iphone_IMG_3543.xml
 IMG_3543.jpg,1242,2208,textbutton,73.0,1983.0,1098.0,151.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,1712.0,1003.0,83.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,1501.0,1003.0,84.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,1292.0,1003.0,83.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,1082.0,1003.0,83.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,872.0,1003.0,83.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,662.0,1003.0,83.0,iphone_IMG_3543.xml
-IMG_3543.jpg,1242,2208,edittext,120.0,453.0,1003.0,83.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,1712.0,1003.0,83.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,1501.0,1003.0,84.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,1292.0,1003.0,83.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,1082.0,1003.0,83.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,872.0,1003.0,83.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,662.0,1003.0,83.0,iphone_IMG_3543.xml
+IMG_3543.jpg,1242,2208,inputfield,120.0,453.0,1003.0,83.0,iphone_IMG_3543.xml
 IMG_3543.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3543.xml
 IMG_9035.jpg,1242,2208,text,227.0,1827.0,788.0,31.0,iphone_IMG_903598.xml
 IMG_9035.jpg,1242,2208,textbutton,171.0,1606.0,901.0,153.0,iphone_IMG_903598.xml
@@ -8038,7 +7892,7 @@ IMG_3958.jpg,1242,2208,icon,835.0,2109.0,68.0,56.0,iphone_IMG_3958.xml
 IMG_3958.jpg,1242,2208,icon,585.0,2107.0,69.0,61.0,iphone_IMG_3958.xml
 IMG_3958.jpg,1242,2208,icon,340.0,2100.0,70.0,71.0,iphone_IMG_3958.xml
 IMG_3958.jpg,1242,2208,icon,92.0,2105.0,67.0,64.0,iphone_IMG_3958.xml
-IMG_3958.jpg,1242,2208,edittext,37.0,79.0,996.0,96.0,iphone_IMG_3958.xml
+IMG_3958.jpg,1242,2208,inputfield,37.0,79.0,996.0,96.0,iphone_IMG_3958.xml
 IMG_3958.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3958.xml
 IMG_8776.jpg,1242,2688,text,448.279236,922.162598,346.59820499999995,74.188537,iphone_IMG_8776.xml
 IMG_8776.jpg,1242,2688,textbutton,636.214294,2435.897217,575.9454959999999,120.33618099999968,iphone_IMG_8776.xml
@@ -8149,36 +8003,36 @@ IMG_3622.jpg,1242,2208,text,422.0,1871.0,402.0,33.0,iphone_IMG_3622.xml
 IMG_3622.jpg,1242,2208,icon,243.0,866.0,181.0,182.0,iphone_IMG_3622.xml
 IMG_3622.jpg,1242,2208,image,530.0,867.0,182.0,182.0,iphone_IMG_3622.xml
 IMG_3622.jpg,1242,2208,image,818.0,866.0,181.0,182.0,iphone_IMG_3622.xml
-IMG_3622.jpg,1242,2208,edittext,61.0,1299.0,1122.0,70.0,iphone_IMG_3622.xml
-IMG_3622.jpg,1242,2208,edittext,60.0,1456.0,1123.0,69.0,iphone_IMG_3622.xml
+IMG_3622.jpg,1242,2208,inputfield,61.0,1299.0,1122.0,70.0,iphone_IMG_3622.xml
+IMG_3622.jpg,1242,2208,inputfield,60.0,1456.0,1123.0,69.0,iphone_IMG_3622.xml
 IMG_3622.jpg,1242,2208,textbutton,61.0,1596.0,1122.0,136.0,iphone_IMG_3622.xml
 IMG_3622.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3622.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,1298.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,158.0,1298.0,138.0,41.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,60.0,1290.0,236.0,51.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,60.0,1290.0,236.0,51.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,1166.0,32.0,33.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,158.0,1164.0,84.0,35.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,60.0,1158.0,183.0,49.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,60.0,1158.0,183.0,49.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,1035.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,158.0,1035.0,117.0,33.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,61.0,1026.0,215.0,49.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,61.0,1026.0,215.0,49.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,903.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,155.0,903.0,61.0,33.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,60.0,894.0,158.0,50.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,60.0,894.0,158.0,50.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,771.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,156.0,769.0,175.0,35.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,60.0,762.0,272.0,49.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,60.0,762.0,272.0,49.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,639.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,156.0,637.0,154.0,43.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,60.0,630.0,251.0,51.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,60.0,630.0,251.0,51.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,507.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,158.0,507.0,82.0,33.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,61.0,498.0,180.0,50.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,61.0,498.0,180.0,50.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,1136.0,375.0,32.0,32.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,931.0,380.0,170.0,22.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,textbutton,906.0,349.0,300.0,84.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,156.0,375.0,150.0,33.0,iphone_IMG_1627.xml
-IMG_1627.jpg,1242,2208,checkedtextview,60.0,366.0,246.0,49.0,iphone_IMG_1627.xml
+IMG_1627.jpg,1242,2208,checkedview,60.0,366.0,246.0,49.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,48.0,242.0,185.0,42.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,icon,61.0,108.0,57.0,37.0,iphone_IMG_1627.xml
 IMG_1627.jpg,1242,2208,text,1044.0,111.0,137.0,35.0,iphone_IMG_1627.xml
@@ -8213,7 +8067,7 @@ IMG_8651.jpg,1242,2208,icon,337.0,2066.0,73.0,65.0,iphone_IMG_865146.xml
 IMG_8651.jpg,1242,2208,image,589.0,2061.0,65.0,71.0,iphone_IMG_865146.xml
 IMG_8651.jpg,1242,2208,icon,835.0,2062.0,68.0,67.0,iphone_IMG_865146.xml
 IMG_8651.jpg,1242,2208,icon,1081.0,2060.0,74.0,74.0,iphone_IMG_865146.xml
-IMG_8651.jpg,1242,2208,edittext,71.0,91.0,1102.0,145.0,iphone_IMG_865146.xml
+IMG_8651.jpg,1242,2208,inputfield,71.0,91.0,1102.0,145.0,iphone_IMG_865146.xml
 IMG_8651.jpg,1242,2208,image,72.0,285.0,532.0,743.0,iphone_IMG_865146.xml
 IMG_8651.jpg,1242,2208,image,639.0,285.0,532.0,743.0,iphone_IMG_865146.xml
 IMG_8651.jpg,1242,2208,image,73.0,1360.0,531.0,672.0,iphone_IMG_865146.xml
@@ -8224,9 +8078,9 @@ IMG_9058.jpg,1242,2208,text,51.0,1314.0,446.0,40.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,text,52.0,1074.0,512.0,49.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,text,390.0,1676.0,464.0,42.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,textbutton,48.0,1467.0,1146.0,134.0,iphone_IMG_905842.xml
-IMG_9058.jpg,1242,2208,edittext,48.0,1314.0,1146.0,74.0,iphone_IMG_905842.xml
+IMG_9058.jpg,1242,2208,inputfield,48.0,1314.0,1146.0,74.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,text,53.0,1236.0,201.0,36.0,iphone_IMG_905842.xml
-IMG_9058.jpg,1242,2208,edittext,48.0,1073.0,1146.0,75.0,iphone_IMG_905842.xml
+IMG_9058.jpg,1242,2208,inputfield,48.0,1073.0,1146.0,75.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,text,52.0,996.0,299.0,37.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,text,349.0,841.0,546.0,46.0,iphone_IMG_905842.xml
 IMG_9058.jpg,1242,2208,text,513.0,726.0,215.0,74.0,iphone_IMG_905842.xml
@@ -8243,12 +8097,12 @@ IMG_3550.jpg,1242,2208,text,95.0,408.0,263.0,35.0,iphone_IMG_3550.xml
 IMG_3550.jpg,1242,2208,text,95.0,552.0,181.0,35.0,iphone_IMG_3550.xml
 IMG_3550.jpg,1242,2208,text,1072.0,557.0,79.0,26.0,iphone_IMG_3550.xml
 IMG_3550.jpg,1242,2208,textbutton,61.0,700.0,1122.0,133.0,iphone_IMG_3550.xml
-IMG_3550.jpg,1242,2208,checkedtextview,61.0,916.0,856.0,61.0,iphone_IMG_3550.xml
+IMG_3550.jpg,1242,2208,checkedview,61.0,916.0,856.0,61.0,iphone_IMG_3550.xml
 IMG_3550.jpg,1242,2208,text,148.0,933.0,769.0,34.0,iphone_IMG_3550.xml
 IMG_3550.jpg,1242,2208,text,64.0,1035.0,796.0,32.0,iphone_IMG_3550.xml
 IMG_3550.jpg,1242,2208,text,558.0,1185.0,127.0,43.0,iphone_IMG_3550.xml
-IMG_3550.jpg,1242,2208,edittext,61.0,509.0,1121.0,120.0,iphone_IMG_3550.xml
-IMG_3550.jpg,1242,2208,edittext,61.0,365.0,1121.0,120.0,iphone_IMG_3550.xml
+IMG_3550.jpg,1242,2208,inputfield,61.0,509.0,1121.0,120.0,iphone_IMG_3550.xml
+IMG_3550.jpg,1242,2208,inputfield,61.0,365.0,1121.0,120.0,iphone_IMG_3550.xml
 IMG_3544.jpg,1242,2208,text,485.0,105.0,275.0,51.0,iphone_IMG_3544.xml
 IMG_3544.jpg,1242,2208,icon,1082.0,90.0,80.0,66.0,iphone_IMG_3544.xml
 IMG_3544.jpg,1242,2208,textbutton,132.0,310.0,301.0,133.0,iphone_IMG_3544.xml
@@ -8280,8 +8134,8 @@ IMG_3544.jpg,1242,2208,text,291.0,648.0,488.0,41.0,iphone_IMG_3544.xml
 IMG_3544.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3544.xml
 IMG_3752.jpg,1242,2208,text,76.0,718.0,157.0,29.0,iphone_IMG_3752.xml
 IMG_3752.jpg,1242,2208,text,75.0,516.0,86.0,29.0,iphone_IMG_3752.xml
-IMG_3752.jpg,1242,2208,edittext,72.0,718.0,1099.0,52.0,iphone_IMG_3752.xml
-IMG_3752.jpg,1242,2208,edittext,72.0,516.0,1099.0,52.0,iphone_IMG_3752.xml
+IMG_3752.jpg,1242,2208,inputfield,72.0,718.0,1099.0,52.0,iphone_IMG_3752.xml
+IMG_3752.jpg,1242,2208,inputfield,72.0,516.0,1099.0,52.0,iphone_IMG_3752.xml
 IMG_3752.jpg,1242,2208,text,73.0,902.0,935.0,87.0,iphone_IMG_3752.xml
 IMG_3752.jpg,1242,2208,text,74.0,805.0,604.0,22.0,iphone_IMG_3752.xml
 IMG_3752.jpg,1242,2208,textbutton,48.0,1032.0,1146.0,145.0,iphone_IMG_3752.xml
@@ -8306,7 +8160,7 @@ IMG_906584.jpg,1242,2208,text,92.0,107.0,377.0,39.0,iphone_IMG_906584.xml
 IMG_906584.jpg,1242,2208,text,529.0,107.0,185.0,38.0,iphone_IMG_906584.xml
 IMG_906584.jpg,1242,2208,image,976.0,229.0,71.0,77.0,iphone_IMG_906584.xml
 IMG_906584.jpg,1242,2208,icon,1122.0,229.0,78.0,77.0,iphone_IMG_906584.xml
-IMG_906584.jpg,1242,2208,checkedtextview,39.0,237.0,260.0,61.0,iphone_IMG_906584.xml
+IMG_906584.jpg,1242,2208,checkedview,39.0,237.0,260.0,61.0,iphone_IMG_906584.xml
 IMG_906584.jpg,1242,2208,icon,821.0,237.0,80.0,62.0,iphone_IMG_906584.xml
 IMG_906584.jpg,1242,2208,text,123.0,251.0,176.0,33.0,iphone_IMG_906584.xml
 IMG_906584.jpg,1242,2208,image,42.0,376.0,239.0,240.0,iphone_IMG_906584.xml
@@ -8498,8 +8352,8 @@ IMG_3625.jpg,1242,2208,text,154.0,902.0,561.0,33.0,iphone_IMG_3625.xml
 IMG_3625.jpg,1242,2208,text,388.0,1724.0,468.0,44.0,iphone_IMG_3625.xml
 IMG_3625.jpg,1242,2208,text,366.0,2109.0,510.0,46.0,iphone_IMG_3625.xml
 IMG_3625.jpg,1242,2208,textbutton,90.0,1497.0,1062.0,175.0,iphone_IMG_3625.xml
-IMG_3625.jpg,1242,2208,edittext,143.0,1322.0,974.0,74.0,iphone_IMG_3625.xml
-IMG_3625.jpg,1242,2208,edittext,142.0,1097.0,975.0,84.0,iphone_IMG_3625.xml
+IMG_3625.jpg,1242,2208,inputfield,143.0,1322.0,974.0,74.0,iphone_IMG_3625.xml
+IMG_3625.jpg,1242,2208,inputfield,142.0,1097.0,975.0,84.0,iphone_IMG_3625.xml
 IMG_3625.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3625.xml
 IMG_898437.jpg,1242,2208,text,239.0,518.0,239.0,44.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,text,239.0,319.0,129.0,45.0,iphone_IMG_898437.xml
@@ -8508,9 +8362,9 @@ IMG_898437.jpg,1242,2208,text,412.0,1059.0,419.0,49.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,text,420.0,878.0,405.0,50.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,textbutton,60.0,663.0,1122.0,151.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,icon,112.0,504.0,65.0,73.0,iphone_IMG_898437.xml
-IMG_898437.jpg,1242,2208,edittext,60.0,465.0,1122.0,151.0,iphone_IMG_898437.xml
+IMG_898437.jpg,1242,2208,inputfield,60.0,465.0,1122.0,151.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,icon,115.0,313.0,60.0,60.0,iphone_IMG_898437.xml
-IMG_898437.jpg,1242,2208,edittext,60.0,267.0,1122.0,151.0,iphone_IMG_898437.xml
+IMG_898437.jpg,1242,2208,inputfield,60.0,267.0,1122.0,151.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,text,554.0,105.0,137.0,50.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,icon,75.0,93.0,35.0,63.0,iphone_IMG_898437.xml
 IMG_898437.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,46.0,iphone_IMG_898437.xml
@@ -8521,9 +8375,9 @@ IMG_906747.jpg,1242,2208,text,482.0,1389.0,276.0,40.0,iphone_IMG_906747.xml
 IMG_906747.jpg,1242,2208,text,316.0,1304.0,609.0,50.0,iphone_IMG_906747.xml
 IMG_906747.jpg,1242,2208,text,255.0,1073.0,735.0,75.0,iphone_IMG_906747.xml
 IMG_906747.jpg,1242,2208,textbutton,194.0,894.0,856.0,121.0,iphone_IMG_906747.xml
-IMG_906747.jpg,1242,2208,edittext,195.0,712.0,854.0,120.0,iphone_IMG_906747.xml
-IMG_906747.jpg,1242,2208,edittext,195.0,562.0,853.0,120.0,iphone_IMG_906747.xml
-IMG_906747.jpg,1242,2208,edittext,195.0,412.0,854.0,120.0,iphone_IMG_906747.xml
+IMG_906747.jpg,1242,2208,inputfield,195.0,712.0,854.0,120.0,iphone_IMG_906747.xml
+IMG_906747.jpg,1242,2208,inputfield,195.0,562.0,853.0,120.0,iphone_IMG_906747.xml
+IMG_906747.jpg,1242,2208,inputfield,195.0,412.0,854.0,120.0,iphone_IMG_906747.xml
 IMG_906747.jpg,1242,2208,text,1083.0,46.0,97.0,50.0,iphone_IMG_906747.xml
 IMG_906747.jpg,1242,2208,text,466.0,46.0,311.0,50.0,iphone_IMG_906747.xml
 IMG_906747.jpg,1242,2208,icon,61.0,40.0,28.0,49.0,iphone_IMG_906747.xml
@@ -8585,7 +8439,6 @@ IMG_2641.jpg,1242,2208,textbutton,60.0,2042.0,1123.0,107.0,iphone_IMG_2641.xml
 IMG_2641.jpg,1242,2208,image,186.0,1211.0,265.0,270.0,iphone_IMG_2641.xml
 IMG_2641.jpg,1242,2208,image,492.0,1212.0,265.0,268.0,iphone_IMG_2641.xml
 IMG_2641.jpg,1242,2208,image,797.0,1211.0,265.0,269.0,iphone_IMG_2641.xml
-IMG_2641.jpg,1242,2208,modal,1.0,1088.0,1241.0,1120.0,iphone_IMG_2641.xml
 IMG_2641.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_2641.xml
 IMG_3588.jpg,1242,2208,text,1086.0,129.0,76.0,29.0,iphone_IMG_3588.xml
 IMG_3588.jpg,1242,2208,text,298.0,380.0,630.0,50.0,iphone_IMG_3588.xml
@@ -8638,33 +8491,33 @@ IMG_2907.jpg,1242,2208,text,838.0,247.0,125.0,38.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1084.0,247.0,158.0,49.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1.0,248.0,84.0,48.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1073.0,399.0,144.0,44.0,iphone_IMG_2907.xml
-IMG_2907.jpg,1242,2208,checkedtextview,46.0,400.0,597.0,47.0,iphone_IMG_2907.xml
+IMG_2907.jpg,1242,2208,checkedview,46.0,400.0,597.0,47.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,140.0,403.0,503.0,38.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,140.0,489.0,805.0,94.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1101.0,490.0,117.0,31.0,iphone_IMG_2907.xml
-IMG_2907.jpg,1242,2208,checkedtextview,44.0,693.0,876.0,47.0,iphone_IMG_2907.xml
+IMG_2907.jpg,1242,2208,checkedview,44.0,693.0,876.0,47.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1072.0,694.0,145.0,44.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,142.0,697.0,777.0,37.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,142.0,783.0,809.0,94.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1100.0,785.0,117.0,30.0,iphone_IMG_2907.xml
-IMG_2907.jpg,1242,2208,checkedtextview,45.0,985.0,608.0,49.0,iphone_IMG_2907.xml
+IMG_2907.jpg,1242,2208,checkedview,45.0,985.0,608.0,49.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1072.0,988.0,145.0,43.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,140.0,990.0,510.0,38.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,139.0,1077.0,805.0,94.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1101.0,1078.0,117.0,31.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1072.0,1281.0,145.0,44.0,iphone_IMG_2907.xml
-IMG_2907.jpg,1242,2208,checkedtextview,46.0,1282.0,500.0,46.0,iphone_IMG_2907.xml
+IMG_2907.jpg,1242,2208,checkedview,46.0,1282.0,500.0,46.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,142.0,1285.0,404.0,37.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,141.0,1371.0,808.0,94.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1101.0,1373.0,117.0,30.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1073.0,1575.0,144.0,44.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,140.0,1579.0,444.0,103.0,iphone_IMG_2907.xml
-IMG_2907.jpg,1242,2208,checkedtextview,46.0,1577.0,541.0,105.0,iphone_IMG_2907.xml
+IMG_2907.jpg,1242,2208,checkedview,46.0,1577.0,541.0,105.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,140.0,1730.0,788.0,41.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1100.0,1732.0,118.0,31.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1073.0,1883.0,144.0,43.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,142.0,1887.0,535.0,102.0,iphone_IMG_2907.xml
-IMG_2907.jpg,1242,2208,checkedtextview,46.0,1884.0,635.0,108.0,iphone_IMG_2907.xml
+IMG_2907.jpg,1242,2208,checkedview,46.0,1884.0,635.0,108.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,138.0,2037.0,718.0,95.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,text,1100.0,2039.0,117.0,31.0,iphone_IMG_2907.xml
 IMG_2907.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_2907.xml
@@ -8698,8 +8551,8 @@ IMG_901623.jpg,1242,2208,icon,57.0,94.0,63.0,63.0,iphone_IMG_901623.xml
 IMG_901623.jpg,1242,2208,image,372.0,97.0,498.0,60.0,iphone_IMG_901623.xml
 IMG_901623.jpg,1242,2208,icon,425.0,468.0,392.0,392.0,iphone_IMG_901623.xml
 IMG_901623.jpg,1242,2208,text,428.0,922.0,383.0,72.0,iphone_IMG_901623.xml
-IMG_901623.jpg,1242,2208,edittext,71.0,1094.0,1100.0,170.0,iphone_IMG_901623.xml
-IMG_901623.jpg,1242,2208,edittext,72.0,1310.0,1099.0,170.0,iphone_IMG_901623.xml
+IMG_901623.jpg,1242,2208,inputfield,71.0,1094.0,1100.0,170.0,iphone_IMG_901623.xml
+IMG_901623.jpg,1242,2208,inputfield,72.0,1310.0,1099.0,170.0,iphone_IMG_901623.xml
 IMG_901623.jpg,1242,2208,textbutton,72.0,1577.0,1099.0,171.0,iphone_IMG_901623.xml
 IMG_901623.jpg,1242,2208,textbutton,72.0,1817.0,1100.0,171.0,iphone_IMG_901623.xml
 IMG_901623.jpg,1242,2208,text,405.0,2070.0,433.0,55.0,iphone_IMG_901623.xml
@@ -8723,15 +8576,15 @@ IMG_8812.jpg,1242,2688,text,175.0,1834.0,341.0,44.0,iphone_IMG_8812.xml
 IMG_8812.jpg,1242,2688,text,175.0,1954.0,290.0,44.0,iphone_IMG_8812.xml
 IMG_8812.jpg,1242,2688,text,178.0,2068.0,987.0,149.0,iphone_IMG_8812.xml
 IMG_8812.jpg,1242,2688,textbutton,72.0,2288.0,1097.0,144.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,checkedtextview,70.0,2056.0,1095.0,161.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,checkedtextview,71.0,1936.0,397.0,76.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,checkedtextview,71.0,1816.0,447.0,76.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,edittext,67.0,1657.0,1097.0,68.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,edittext,67.0,1441.0,1097.0,64.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,edittext,67.0,1224.0,1097.0,65.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,edittext,67.0,1008.0,1097.0,63.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,edittext,67.0,791.0,1097.0,62.0,iphone_IMG_8812.xml
-IMG_8812.jpg,1242,2688,edittext,67.0,580.0,1097.0,61.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,checkedview,70.0,2056.0,1095.0,161.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,checkedview,71.0,1936.0,397.0,76.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,checkedview,71.0,1816.0,447.0,76.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,inputfield,67.0,1657.0,1097.0,68.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,inputfield,67.0,1441.0,1097.0,64.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,inputfield,67.0,1224.0,1097.0,65.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,inputfield,67.0,1008.0,1097.0,63.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,inputfield,67.0,791.0,1097.0,62.0,iphone_IMG_8812.xml
+IMG_8812.jpg,1242,2688,inputfield,67.0,580.0,1097.0,61.0,iphone_IMG_8812.xml
 IMG_3576.jpg,1242,2208,text,86.0,886.0,79.0,26.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,text,85.0,651.0,211.0,26.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,icon,1077.0,2109.0,81.0,66.0,iphone_IMG_3576.xml
@@ -8739,8 +8592,8 @@ IMG_3576.jpg,1242,2208,icon,831.0,2109.0,71.0,67.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,icon,583.0,2108.0,74.0,67.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,icon,340.0,2108.0,67.0,67.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,image,85.0,2109.0,79.0,65.0,iphone_IMG_3576.xml
-IMG_3576.jpg,1242,2208,edittext,61.0,601.0,1123.0,127.0,iphone_IMG_3576.xml
-IMG_3576.jpg,1242,2208,edittext,61.0,835.0,1123.0,127.0,iphone_IMG_3576.xml
+IMG_3576.jpg,1242,2208,inputfield,61.0,601.0,1123.0,127.0,iphone_IMG_3576.xml
+IMG_3576.jpg,1242,2208,inputfield,61.0,835.0,1123.0,127.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,text,64.0,793.0,104.0,29.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,text,63.0,559.0,257.0,29.0,iphone_IMG_3576.xml
 IMG_3576.jpg,1242,2208,icon,36.0,93.0,37.0,67.0,iphone_IMG_3576.xml
@@ -8751,11 +8604,11 @@ IMG_3576.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3576.xml
 IMG_2668.jpg,1242,2208,text,64.0,584.0,100.0,33.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,text,64.0,833.0,181.0,33.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,text,795.0,2093.0,143.0,42.0,iphone_IMG_2668.xml
-IMG_2668.jpg,1242,2208,edittext,60.0,826.0,1123.0,91.0,iphone_IMG_2668.xml
+IMG_2668.jpg,1242,2208,inputfield,60.0,826.0,1123.0,91.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,image,470.0,300.0,340.0,186.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,text,552.0,107.0,137.0,52.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,text,815.0,970.0,355.0,42.0,iphone_IMG_2668.xml
-IMG_2668.jpg,1242,2208,edittext,60.0,584.0,1123.0,84.0,iphone_IMG_2668.xml
+IMG_2668.jpg,1242,2208,inputfield,60.0,584.0,1123.0,84.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,icon,1110.0,827.0,64.0,38.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,icon,1115.0,1936.0,20.0,31.0,iphone_IMG_2668.xml
 IMG_2668.jpg,1242,2208,textbutton,60.0,1892.0,1123.0,122.0,iphone_IMG_2668.xml
@@ -8776,8 +8629,8 @@ IMG_3574.jpg,1242,2208,text,550.0,113.0,143.0,46.0,iphone_IMG_3574.xml
 IMG_3574.jpg,1242,2208,text,63.0,115.0,137.0,35.0,iphone_IMG_3574.xml
 IMG_3574.jpg,1242,2208,text,63.0,409.0,104.0,29.0,iphone_IMG_3574.xml
 IMG_3574.jpg,1242,2208,text,63.0,643.0,176.0,30.0,iphone_IMG_3574.xml
-IMG_3574.jpg,1242,2208,edittext,61.0,686.0,1121.0,126.0,iphone_IMG_3574.xml
-IMG_3574.jpg,1242,2208,edittext,61.0,452.0,1121.0,126.0,iphone_IMG_3574.xml
+IMG_3574.jpg,1242,2208,inputfield,61.0,686.0,1121.0,126.0,iphone_IMG_3574.xml
+IMG_3574.jpg,1242,2208,inputfield,61.0,452.0,1121.0,126.0,iphone_IMG_3574.xml
 IMG_3574.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3574.xml
 IMG_3560.jpg,1242,2208,icon,1077.0,2109.0,81.0,66.0,iphone_IMG_3560.xml
 IMG_3560.jpg,1242,2208,icon,832.0,2109.0,70.0,66.0,iphone_IMG_3560.xml
@@ -8813,7 +8666,7 @@ IMG_8757.jpg,1242,2688,icon,145.541977,2450.89624,55.661667,55.355469000000085,i
 IMG_8757.jpg,1242,2688,text,243.488098,2311.752441,253.277588,38.78393599999981,iphone_IMG_8757.xml
 IMG_8757.jpg,1242,2688,text,243.567032,2459.0,184.299484,48.42553700000008,iphone_IMG_8757.xml
 IMG_8757.jpg,1242,2688,icon,711.235718,184.788574,18.37396200000001,33.27569599999998,iphone_IMG_8757.xml
-IMG_8757.jpg,1242,2688,drawer,1.0,1.0,779.0,2687.0,iphone_IMG_8757.xml
+IMG_8757.jpg,1242,2688,slidingmenu,1.0,1.0,779.0,2687.0,iphone_IMG_8757.xml
 IMG_1571.jpg,1242,2208,image,485.552887,772.594299,281.87326,280.97882100000004,iphone_IMG_1571.xml
 IMG_1571.jpg,1242,2208,icon,813.331787,889.761597,83.90301499999998,46.8452759999999,iphone_IMG_1571.xml
 IMG_1571.jpg,1242,2208,icon,353.823639,889.711853,84.82903999999996,46.93298300000004,iphone_IMG_1571.xml
@@ -8833,7 +8686,7 @@ IMG_9093.jpg,1242,2208,icon,81.0,105.0,44.0,44.0,iphone_IMG_909320.xml
 IMG_9093.jpg,1242,2208,text,52.0,319.0,734.0,73.0,iphone_IMG_909320.xml
 IMG_9093.jpg,1242,2208,text,50.0,476.0,1084.0,137.0,iphone_IMG_909320.xml
 IMG_9093.jpg,1242,2208,text,52.0,728.0,110.0,36.0,iphone_IMG_909320.xml
-IMG_9093.jpg,1242,2208,edittext,48.0,812.0,1147.0,76.0,iphone_IMG_909320.xml
+IMG_9093.jpg,1242,2208,inputfield,48.0,812.0,1147.0,76.0,iphone_IMG_909320.xml
 IMG_9093.jpg,1242,2208,textbutton,48.0,982.0,1146.0,133.0,iphone_IMG_909320.xml
 IMG_9093.jpg,1242,2208,textbutton,49.0,1162.0,1146.0,133.0,iphone_IMG_909320.xml
 IMG_9093.jpg,1242,2208,text,246.0,1397.0,749.0,118.0,iphone_IMG_909320.xml
@@ -8945,8 +8798,8 @@ IMG_3607.jpg,1242,2208,text,356.0,2054.0,534.0,40.0,iphone_IMG_3607.xml
 IMG_3607.jpg,1242,2208,text,449.0,1631.0,344.0,40.0,iphone_IMG_3607.xml
 IMG_3607.jpg,1242,2208,textbutton,60.0,1421.0,1122.0,150.0,iphone_IMG_3607.xml
 IMG_3607.jpg,1242,2208,icon,1064.0,1275.0,49.0,37.0,iphone_IMG_3607.xml
-IMG_3607.jpg,1242,2208,edittext,60.0,1219.0,1122.0,151.0,iphone_IMG_3607.xml
-IMG_3607.jpg,1242,2208,edittext,60.0,1018.0,1122.0,151.0,iphone_IMG_3607.xml
+IMG_3607.jpg,1242,2208,inputfield,60.0,1219.0,1122.0,151.0,iphone_IMG_3607.xml
+IMG_3607.jpg,1242,2208,inputfield,60.0,1018.0,1122.0,151.0,iphone_IMG_3607.xml
 IMG_3607.jpg,1242,2208,text,600.0,884.0,44.0,29.0,iphone_IMG_3607.xml
 IMG_3607.jpg,1242,2208,text,169.0,359.0,908.0,94.0,iphone_IMG_3607.xml
 IMG_3607.jpg,1242,2208,icon,1116.0,102.0,48.0,49.0,iphone_IMG_3607.xml
@@ -8985,8 +8838,8 @@ IMG_3766.jpg,1242,2208,icon,60.0,99.0,33.0,55.0,iphone_IMG_3766.xml
 IMG_3766.jpg,1242,2208,text,531.0,264.0,181.0,68.0,iphone_IMG_3766.xml
 IMG_3766.jpg,1242,2208,text,1082.0,636.0,100.0,26.0,iphone_IMG_3766.xml
 IMG_3766.jpg,1242,2208,text,470.0,786.0,305.0,35.0,iphone_IMG_3766.xml
-IMG_3766.jpg,1242,2208,edittext,30.0,420.0,1184.0,150.0,iphone_IMG_3766.xml
-IMG_3766.jpg,1242,2208,edittext,30.0,573.0,1184.0,150.0,iphone_IMG_3766.xml
+IMG_3766.jpg,1242,2208,inputfield,30.0,420.0,1184.0,150.0,iphone_IMG_3766.xml
+IMG_3766.jpg,1242,2208,inputfield,30.0,573.0,1184.0,150.0,iphone_IMG_3766.xml
 IMG_3766.jpg,1242,2208,textbutton,231.0,1973.0,781.0,152.0,iphone_IMG_3766.xml
 IMG_3766.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3766.xml
 IMG_8642.jpg,1242,2208,text,228.0,142.0,241.0,37.0,iphone_IMG_864297.xml
@@ -9034,7 +8887,7 @@ IMG_8642.jpg,1242,2208,icon,1097.0,446.0,49.0,44.0,iphone_IMG_864297.xml
 IMG_8642.jpg,1242,2208,image,639.0,424.0,531.0,354.0,iphone_IMG_864297.xml
 IMG_8642.jpg,1242,2208,image,73.0,424.0,531.0,354.0,iphone_IMG_864297.xml
 IMG_8642.jpg,1242,2208,text,76.0,302.0,1066.0,46.0,iphone_IMG_864297.xml
-IMG_8642.jpg,1242,2208,edittext,72.0,91.0,1100.0,143.0,iphone_IMG_864297.xml
+IMG_8642.jpg,1242,2208,inputfield,72.0,91.0,1100.0,143.0,iphone_IMG_864297.xml
 IMG_8642.jpg,1242,2208,icon,138.0,139.0,27.0,48.0,iphone_IMG_864297.xml
 IMG_8642.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_864297.xml
 IMG_1367.jpg,1242,2208,text,427.0,82.0,391.0,40.0,iphone_IMG_1367.xml
@@ -9141,7 +8994,7 @@ IMG_8639.jpg,1242,2208,image,639.0,444.0,531.0,354.0,iphone_IMG_863920.xml
 IMG_8639.jpg,1242,2208,image,72.0,445.0,531.0,354.0,iphone_IMG_863920.xml
 IMG_8639.jpg,1242,2208,text,77.0,297.0,734.0,70.0,iphone_IMG_863920.xml
 IMG_8639.jpg,1242,2208,icon,130.0,139.0,46.0,47.0,iphone_IMG_863920.xml
-IMG_8639.jpg,1242,2208,edittext,72.0,91.0,1100.0,144.0,iphone_IMG_863920.xml
+IMG_8639.jpg,1242,2208,inputfield,72.0,91.0,1100.0,144.0,iphone_IMG_863920.xml
 IMG_8639.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_863920.xml
 IMG_3837.jpg,1242,2208,text,138.0,265.0,246.0,36.0,iphone_IMG_3837.xml
 IMG_3837.jpg,1242,2208,image,623.0,1902.0,581.0,270.0,iphone_IMG_3837.xml
@@ -9160,7 +9013,7 @@ IMG_3837.jpg,1242,2208,text,423.0,100.0,397.0,46.0,iphone_IMG_3837.xml
 IMG_3837.jpg,1242,2208,icon,100.0,77.0,68.0,51.0,iphone_IMG_3837.xml
 IMG_3837.jpg,1242,2208,text,93.0,142.0,82.0,32.0,iphone_IMG_3837.xml
 IMG_3837.jpg,1242,2208,icon,61.0,261.0,45.0,45.0,iphone_IMG_3837.xml
-IMG_3837.jpg,1242,2208,edittext,48.0,261.0,1147.0,68.0,iphone_IMG_3837.xml
+IMG_3837.jpg,1242,2208,inputfield,48.0,261.0,1147.0,68.0,iphone_IMG_3837.xml
 IMG_3837.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3837.xml
 IMG_3360.jpg,1242,2208,text,49.0,341.0,813.0,57.0,iphone_IMG_3360.xml
 IMG_3360.jpg,1242,2208,text,64.0,523.0,529.0,49.0,iphone_IMG_3360.xml
@@ -9245,7 +9098,7 @@ IMG_8648.jpg,1242,2208,image,640.0,438.0,530.0,354.0,iphone_IMG_864874.xml
 IMG_8648.jpg,1242,2208,icon,530.0,459.0,50.0,45.0,iphone_IMG_864874.xml
 IMG_8648.jpg,1242,2208,image,74.0,438.0,530.0,354.0,iphone_IMG_864874.xml
 IMG_8648.jpg,1242,2208,text,76.0,290.0,760.0,69.0,iphone_IMG_864874.xml
-IMG_8648.jpg,1242,2208,edittext,72.0,91.0,1100.0,144.0,iphone_IMG_864874.xml
+IMG_8648.jpg,1242,2208,inputfield,72.0,91.0,1100.0,144.0,iphone_IMG_864874.xml
 IMG_8648.jpg,1242,2208,icon,137.0,138.0,28.0,49.0,iphone_IMG_864874.xml
 IMG_8648.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,46.0,iphone_IMG_864874.xml
 IMG_8988.jpg,1242,2208,image,285.0,639.0,673.0,1031.0,iphone_IMG_8988.xml
@@ -9268,8 +9121,8 @@ IMG_3765.jpg,1242,2208,text,182.0,2077.0,877.0,69.0,iphone_IMG_3765.xml
 IMG_3765.jpg,1242,2208,textbutton,230.0,1874.0,783.0,153.0,iphone_IMG_3765.xml
 IMG_3765.jpg,1242,2208,text,383.0,259.0,480.0,53.0,iphone_IMG_3765.xml
 IMG_3765.jpg,1242,2208,icon,61.0,99.0,31.0,55.0,iphone_IMG_3765.xml
-IMG_3765.jpg,1242,2208,edittext,29.0,593.0,1184.0,150.0,iphone_IMG_3765.xml
-IMG_3765.jpg,1242,2208,edittext,29.0,440.0,1184.0,150.0,iphone_IMG_3765.xml
+IMG_3765.jpg,1242,2208,inputfield,29.0,593.0,1184.0,150.0,iphone_IMG_3765.xml
+IMG_3765.jpg,1242,2208,inputfield,29.0,440.0,1184.0,150.0,iphone_IMG_3765.xml
 IMG_3765.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3765.xml
 IMG_3500.jpg,1242,2208,text,121.0,1276.0,1001.0,163.0,iphone_IMG_3500.xml
 IMG_3500.jpg,1242,2208,text,396.0,1466.0,433.0,53.0,iphone_IMG_3500.xml
@@ -9310,7 +9163,7 @@ IMG_3528.jpg,1242,2208,icon,84.0,122.0,44.0,44.0,iphone_IMG_3528.xml
 IMG_3528.jpg,1242,2208,text,149.0,121.0,354.0,51.0,iphone_IMG_3528.xml
 IMG_3528.jpg,1242,2208,image,636.0,370.0,577.0,577.0,iphone_IMG_3528.xml
 IMG_3528.jpg,1242,2208,image,30.0,370.0,577.0,577.0,iphone_IMG_3528.xml
-IMG_3528.jpg,1242,2208,edittext,61.0,90.0,1122.0,109.0,iphone_IMG_3528.xml
+IMG_3528.jpg,1242,2208,inputfield,61.0,90.0,1122.0,109.0,iphone_IMG_3528.xml
 IMG_3528.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3528.xml
 IMG_9130.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_913047.xml
 IMG_9130.jpg,1242,2208,text,85.0,2174.0,82.0,24.0,iphone_IMG_913047.xml
@@ -9354,7 +9207,7 @@ IMG_3064.jpg,1242,2208,text,150.0,563.0,947.0,172.0,iphone_IMG_3064.xml
 IMG_3064.jpg,1242,2208,text,296.0,2106.0,648.0,51.0,iphone_IMG_3064.xml
 IMG_3064.jpg,1242,2208,textbutton,468.0,1871.0,307.0,146.0,iphone_IMG_3064.xml
 IMG_3064.jpg,1242,2208,image,249.0,931.0,746.0,750.0,iphone_IMG_3064.xml
-IMG_3064.jpg,1242,2208,edittext,120.0,324.0,1003.0,146.0,iphone_IMG_3064.xml
+IMG_3064.jpg,1242,2208,inputfield,120.0,324.0,1003.0,146.0,iphone_IMG_3064.xml
 IMG_3064.jpg,1242,2208,icon,165.0,369.0,56.0,55.0,iphone_IMG_3064.xml
 IMG_3064.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3064.xml
 IMG_8866.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_886666.xml
@@ -9401,7 +9254,7 @@ IMG_3689.jpg,1242,2208,icon,58.0,504.0,46.0,46.0,iphone_IMG_3689.xml
 IMG_3689.jpg,1242,2208,icon,57.0,384.0,46.0,47.0,iphone_IMG_3689.xml
 IMG_3689.jpg,1242,2208,icon,57.0,264.0,46.0,47.0,iphone_IMG_3689.xml
 IMG_3689.jpg,1242,2208,icon,56.0,116.0,46.0,46.0,iphone_IMG_3689.xml
-IMG_3689.jpg,1242,2208,edittext,31.0,75.0,1182.0,121.0,iphone_IMG_3689.xml
+IMG_3689.jpg,1242,2208,inputfield,31.0,75.0,1182.0,121.0,iphone_IMG_3689.xml
 IMG_3689.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3689.xml
 IMG_1539.jpg,1242,2208,text,142.524597,1083.922119,429.475403,45.98083499999984,iphone_IMG_1539.xml
 IMG_1539.jpg,1242,2208,text,139.596558,1172.0,818.403442,102.937866,iphone_IMG_1539.xml
@@ -9413,7 +9266,6 @@ IMG_1539.jpg,1242,2208,text,138.644852,975.838684,732.417953,47.9387210000001,ip
 IMG_1539.jpg,1242,2208,text,141.58667,459.531799,691.7547,56.54461700000002,iphone_IMG_1539.xml
 IMG_1539.jpg,1242,2208,icon,1021.993774,450.30249,62.36389200000008,60.87307800000002,iphone_IMG_1539.xml
 IMG_1539.jpg,1242,2208,image,137.638229,621.432068,968.766312,276.373291,iphone_IMG_1539.xml
-IMG_1539.jpg,1242,2208,modal,90.0,385.0,1064.363281,1439.447998,iphone_IMG_1539.xml
 IMG_8988.jpg,1242,2208,textbutton,72.0,1193.0,1098.0,151.0,iphone_IMG_898896.xml
 IMG_8988.jpg,1242,2208,text,84.0,999.0,1076.0,97.0,iphone_IMG_898896.xml
 IMG_8988.jpg,1242,2208,text,138.0,876.0,964.0,55.0,iphone_IMG_898896.xml
@@ -9476,10 +9328,10 @@ IMG_3918.jpg,1242,2208,text,49.0,239.0,216.0,36.0,iphone_IMG_3918.xml
 IMG_3918.jpg,1242,2208,text,48.0,372.0,214.0,35.0,iphone_IMG_3918.xml
 IMG_3918.jpg,1242,2208,text,49.0,503.0,107.0,35.0,iphone_IMG_3918.xml
 IMG_3918.jpg,1242,2208,text,49.0,635.0,192.0,35.0,iphone_IMG_3918.xml
-IMG_3918.jpg,1242,2208,edittext,45.0,631.0,1179.0,91.0,iphone_IMG_3918.xml
-IMG_3918.jpg,1242,2208,edittext,45.0,503.0,1179.0,87.0,iphone_IMG_3918.xml
-IMG_3918.jpg,1242,2208,edittext,45.0,372.0,1179.0,86.0,iphone_IMG_3918.xml
-IMG_3918.jpg,1242,2208,edittext,45.0,239.0,1179.0,87.0,iphone_IMG_3918.xml
+IMG_3918.jpg,1242,2208,inputfield,45.0,631.0,1179.0,91.0,iphone_IMG_3918.xml
+IMG_3918.jpg,1242,2208,inputfield,45.0,503.0,1179.0,87.0,iphone_IMG_3918.xml
+IMG_3918.jpg,1242,2208,inputfield,45.0,372.0,1179.0,86.0,iphone_IMG_3918.xml
+IMG_3918.jpg,1242,2208,inputfield,45.0,239.0,1179.0,87.0,iphone_IMG_3918.xml
 IMG_3918.jpg,1242,2208,text,447.0,101.0,350.0,46.0,iphone_IMG_3918.xml
 IMG_3918.jpg,1242,2208,text,63.0,107.0,154.0,40.0,iphone_IMG_3918.xml
 IMG_3918.jpg,1242,2208,textbutton,59.0,1182.0,1125.0,133.0,iphone_IMG_3918.xml
@@ -9512,27 +9364,27 @@ IMG_3071.jpg,1242,2208,text,93.0,109.0,94.0,38.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,476.0,109.0,292.0,46.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,1068.0,110.0,114.0,40.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,64.0,239.0,508.0,42.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,64.0,328.0,1122.0,62.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,64.0,328.0,1122.0,62.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,64.0,341.0,262.0,48.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,64.0,454.0,1122.0,61.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,64.0,454.0,1122.0,61.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,64.0,468.0,148.0,38.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,64.0,580.0,1122.0,63.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,64.0,580.0,1122.0,63.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,64.0,593.0,329.0,50.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,61.0,706.0,1125.0,63.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,61.0,706.0,1125.0,63.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,61.0,719.0,325.0,50.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,64.0,831.0,1122.0,62.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,64.0,831.0,1122.0,62.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,64.0,845.0,86.0,38.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,60.0,954.0,231.0,38.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,64.0,1153.0,333.0,48.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,62.0,1237.0,1124.0,62.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,62.0,1237.0,1124.0,62.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,62.0,1249.0,360.0,50.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,65.0,1362.0,1121.0,62.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,65.0,1362.0,1121.0,62.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,65.0,1379.0,125.0,35.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,61.0,1489.0,1125.0,61.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,61.0,1489.0,1125.0,61.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,61.0,1502.0,130.0,38.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,61.0,1614.0,1125.0,62.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,61.0,1614.0,1125.0,62.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,61.0,1628.0,234.0,38.0,iphone_IMG_3071.xml
-IMG_3071.jpg,1242,2208,checkedtextview,62.0,1741.0,1124.0,63.0,iphone_IMG_3071.xml
+IMG_3071.jpg,1242,2208,checkedview,62.0,1741.0,1124.0,63.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,text,62.0,1756.0,159.0,48.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,textbutton,58.0,1863.0,1125.0,169.0,iphone_IMG_3071.xml
 IMG_3071.jpg,1242,2208,icon,92.0,2085.0,68.0,65.0,iphone_IMG_3071.xml
@@ -9582,7 +9434,7 @@ IMG_2621.jpg,1242,2208,icon,1087.0,2102.0,61.0,62.0,iphone_IMG_2621.xml
 IMG_2621.jpg,1242,2208,image,954.0,845.0,155.0,392.0,iphone_IMG_2621.xml
 IMG_2621.jpg,1242,2208,image,947.0,1291.0,163.0,393.0,iphone_IMG_2621.xml
 IMG_2621.jpg,1242,2208,image,883.0,1731.0,262.0,329.0,iphone_IMG_2621.xml
-IMG_2621.jpg,1242,2208,edittext,24.0,78.0,1194.0,97.0,iphone_IMG_2621.xml
+IMG_2621.jpg,1242,2208,inputfield,24.0,78.0,1194.0,97.0,iphone_IMG_2621.xml
 IMG_2621.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_2621.xml
 IMG_9947.jpg,1242,2208,text,220.646072,2157.983643,105.119736,26.151366999999937,iphone_IMG_9947.xml
 IMG_9947.jpg,1242,2208,text,551.0,2158.0,140.575562,32.13207999999986,iphone_IMG_9947.xml
@@ -9609,9 +9461,9 @@ IMG_3661.jpg,1242,2208,text,50.0,337.0,528.0,47.0,iphone_IMG_3661.xml
 IMG_3661.jpg,1242,2208,text,48.0,397.0,1044.0,89.0,iphone_IMG_3661.xml
 IMG_3661.jpg,1242,2208,text,1085.0,1113.0,106.0,24.0,iphone_IMG_3661.xml
 IMG_3661.jpg,1242,2208,text,242.0,1226.0,756.0,31.0,iphone_IMG_3661.xml
-IMG_3661.jpg,1242,2208,edittext,48.0,642.0,1147.0,79.0,iphone_IMG_3661.xml
-IMG_3661.jpg,1242,2208,edittext,49.0,866.0,1146.0,79.0,iphone_IMG_3661.xml
-IMG_3661.jpg,1242,2208,edittext,48.0,1090.0,1146.0,79.0,iphone_IMG_3661.xml
+IMG_3661.jpg,1242,2208,inputfield,48.0,642.0,1147.0,79.0,iphone_IMG_3661.xml
+IMG_3661.jpg,1242,2208,inputfield,49.0,866.0,1146.0,79.0,iphone_IMG_3661.xml
+IMG_3661.jpg,1242,2208,inputfield,48.0,1090.0,1146.0,79.0,iphone_IMG_3661.xml
 IMG_3661.jpg,1242,2208,textbutton,48.0,2015.0,1147.0,146.0,iphone_IMG_3661.xml
 IMG_3661.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3661.xml
 IMG_9115.jpg,1242,2208,text,104.0,921.0,271.0,40.0,iphone_IMG_911531.xml
@@ -9622,17 +9474,17 @@ IMG_9115.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,icon,48.0,89.0,38.0,62.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,text,1096.0,100.0,99.0,37.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,text,366.0,343.0,511.0,35.0,iphone_IMG_911531.xml
-IMG_9115.jpg,1242,2208,edittext,96.0,532.0,514.0,86.0,iphone_IMG_911531.xml
-IMG_9115.jpg,1242,2208,edittext,633.0,531.0,514.0,87.0,iphone_IMG_911531.xml
-IMG_9115.jpg,1242,2208,edittext,97.0,726.0,1050.0,86.0,iphone_IMG_911531.xml
-IMG_9115.jpg,1242,2208,edittext,100.0,921.0,1047.0,86.0,iphone_IMG_911531.xml
+IMG_9115.jpg,1242,2208,inputfield,96.0,532.0,514.0,86.0,iphone_IMG_911531.xml
+IMG_9115.jpg,1242,2208,inputfield,633.0,531.0,514.0,87.0,iphone_IMG_911531.xml
+IMG_9115.jpg,1242,2208,inputfield,97.0,726.0,1050.0,86.0,iphone_IMG_911531.xml
+IMG_9115.jpg,1242,2208,inputfield,100.0,921.0,1047.0,86.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,text,98.0,1024.0,398.0,35.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,text,378.0,1422.0,487.0,53.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,text,234.0,2018.0,773.0,112.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,textbutton,98.0,168.0,1051.0,146.0,iphone_IMG_911531.xml
 IMG_9115.jpg,1242,2208,textbutton,96.0,1160.0,1051.0,146.0,iphone_IMG_911531.xml
 IMG_3311.jpg,1242,2208,text,109.0,762.0,218.0,44.0,iphone_IMG_3311.xml
-IMG_3311.jpg,1242,2208,edittext,108.0,763.0,1027.0,81.0,iphone_IMG_3311.xml
+IMG_3311.jpg,1242,2208,inputfield,108.0,763.0,1027.0,81.0,iphone_IMG_3311.xml
 IMG_3311.jpg,1242,2208,image,409.0,107.0,422.0,149.0,iphone_IMG_3311.xml
 IMG_3311.jpg,1242,2208,icon,45.0,156.0,49.0,50.0,iphone_IMG_3311.xml
 IMG_3311.jpg,1242,2208,text,110.0,474.0,985.0,121.0,iphone_IMG_3311.xml
@@ -9647,9 +9499,9 @@ IMG_5749.jpg,1242,2688,textbutton,49.0,1780.993286,1145.696167,144.5457760000001
 IMG_5749.jpg,1242,2688,text,336.0,2012.964478,571.453979,46.0355219999999,iphone_IMG_5749.xml
 IMG_5749.jpg,1242,2688,text,65.5495,1083.451416,1106.9209589999998,84.77648899999986,iphone_IMG_5749.xml
 IMG_5749.jpg,1242,2688,textbutton,48.479309,874.42749,1144.520691,144.44818099999998,iphone_IMG_5749.xml
-IMG_5749.jpg,1242,2688,edittext,48.979889,700.547119,1145.419281,138.25494400000002,iphone_IMG_5749.xml
-IMG_5749.jpg,1242,2688,edittext,48.85078,512.752258,1145.562306,139.91125499999998,iphone_IMG_5749.xml
-IMG_5749.jpg,1242,2688,edittext,48.824467,324.601654,1145.504635,140.34146099999998,iphone_IMG_5749.xml
+IMG_5749.jpg,1242,2688,inputfield,48.979889,700.547119,1145.419281,138.25494400000002,iphone_IMG_5749.xml
+IMG_5749.jpg,1242,2688,inputfield,48.85078,512.752258,1145.562306,139.91125499999998,iphone_IMG_5749.xml
+IMG_5749.jpg,1242,2688,inputfield,48.824467,324.601654,1145.504635,140.34146099999998,iphone_IMG_5749.xml
 IMG_5749.jpg,1242,2688,text,63.587708,178.702408,153.54951400000002,39.313736000000006,iphone_IMG_5749.xml
 IMG_5749.jpg,1242,2688,uppertaskbar,112.766289,49.769321,1064.599556,37.74281,iphone_IMG_5749.xml
 IMG_1507.jpg,1242,2208,image,540.380859,478.653625,162.14386000000002,125.31030300000003,iphone_IMG_1507.xml
@@ -9716,8 +9568,8 @@ IMG_3700.jpg,1242,2208,icon,301.0,1503.0,209.0,41.0,iphone_IMG_3700.xml
 IMG_3700.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3700.xml
 IMG_3066.jpg,1242,2208,text,156.0,527.0,275.0,37.0,iphone_IMG_3066.xml
 IMG_3066.jpg,1242,2208,text,157.0,718.0,189.0,38.0,iphone_IMG_3066.xml
-IMG_3066.jpg,1242,2208,edittext,84.0,651.0,1075.0,169.0,iphone_IMG_3066.xml
-IMG_3066.jpg,1242,2208,edittext,84.0,459.0,1075.0,170.0,iphone_IMG_3066.xml
+IMG_3066.jpg,1242,2208,inputfield,84.0,651.0,1075.0,169.0,iphone_IMG_3066.xml
+IMG_3066.jpg,1242,2208,inputfield,84.0,459.0,1075.0,170.0,iphone_IMG_3066.xml
 IMG_3066.jpg,1242,2208,text,303.0,2086.0,639.0,50.0,iphone_IMG_3066.xml
 IMG_3066.jpg,1242,2208,text,454.0,1205.0,333.0,39.0,iphone_IMG_3066.xml
 IMG_3066.jpg,1242,2208,text,465.0,857.0,314.0,44.0,iphone_IMG_3066.xml
@@ -9746,7 +9598,7 @@ IMG_901864.jpg,1242,2208,image,48.0,609.0,1146.0,427.0,iphone_IMG_901864.xml
 IMG_901864.jpg,1242,2208,text,1015.0,456.0,177.0,32.0,iphone_IMG_901864.xml
 IMG_901864.jpg,1242,2208,text,51.0,455.0,153.0,42.0,iphone_IMG_901864.xml
 IMG_901864.jpg,1242,2208,icon,92.0,270.0,73.0,72.0,iphone_IMG_901864.xml
-IMG_901864.jpg,1242,2208,edittext,30.0,216.0,1183.0,181.0,iphone_IMG_901864.xml
+IMG_901864.jpg,1242,2208,inputfield,30.0,216.0,1183.0,181.0,iphone_IMG_901864.xml
 IMG_901864.jpg,1242,2208,icon,64.0,100.0,53.0,54.0,iphone_IMG_901864.xml
 IMG_901864.jpg,1242,2208,image,373.0,97.0,498.0,60.0,iphone_IMG_901864.xml
 IMG_901864.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_901864.xml
@@ -9760,7 +9612,7 @@ IMG_5198.jpg,1242,2208,icon,543.0,267.0,159.0,151.0,iphone_IMG_5198.xml
 IMG_5198.jpg,1242,2208,backgroundimage,1.0,193.0,1241.0,2015.0,iphone_IMG_5198.xml
 IMG_5198.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_5198.xml
 IMG_2608.jpg,1242,2208,text,135.0,139.0,413.0,40.0,iphone_IMG_2608.xml
-IMG_2608.jpg,1242,2208,edittext,46.0,102.0,1152.0,109.0,iphone_IMG_2608.xml
+IMG_2608.jpg,1242,2208,inputfield,46.0,102.0,1152.0,109.0,iphone_IMG_2608.xml
 IMG_2608.jpg,1242,2208,text,53.0,269.0,209.0,44.0,iphone_IMG_2608.xml
 IMG_2608.jpg,1242,2208,text,976.0,278.0,216.0,41.0,iphone_IMG_2608.xml
 IMG_2608.jpg,1242,2208,text,49.0,969.0,385.0,97.0,iphone_IMG_2608.xml
@@ -9801,7 +9653,7 @@ IMG_2618.jpg,1242,2208,icon,522.0,380.0,38.0,38.0,iphone_IMG_2618.xml
 IMG_2618.jpg,1242,2208,image,1.0,1747.0,1241.0,444.0,iphone_IMG_2618.xml
 IMG_2618.jpg,1242,2208,image,1.0,1273.0,1241.0,444.0,iphone_IMG_2618.xml
 IMG_2618.jpg,1242,2208,image,1.0,800.0,1241.0,444.0,iphone_IMG_2618.xml
-IMG_2618.jpg,1242,2208,edittext,25.0,355.0,1193.0,90.0,iphone_IMG_2618.xml
+IMG_2618.jpg,1242,2208,inputfield,25.0,355.0,1193.0,90.0,iphone_IMG_2618.xml
 IMG_2618.jpg,1242,2208,image,1.0,331.0,1241.0,439.0,iphone_IMG_2618.xml
 IMG_2618.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,60.0,iphone_IMG_2618.xml
 IMG_1649.jpg,1242,2208,image,438.629822,1267.145996,364.78833,385.772095,iphone_IMG_1649.xml
@@ -9826,7 +9678,7 @@ IMG_3076.jpg,1242,2208,icon,166.0,369.0,54.0,54.0,iphone_IMG_3076.xml
 IMG_3076.jpg,1242,2208,text,160.0,557.0,928.0,164.0,iphone_IMG_3076.xml
 IMG_3076.jpg,1242,2208,textbutton,471.0,1871.0,301.0,146.0,iphone_IMG_3076.xml
 IMG_3076.jpg,1242,2208,textbutton,290.0,2105.0,660.0,47.0,iphone_IMG_3076.xml
-IMG_3076.jpg,1242,2208,edittext,120.0,324.0,1003.0,145.0,iphone_IMG_3076.xml
+IMG_3076.jpg,1242,2208,inputfield,120.0,324.0,1003.0,145.0,iphone_IMG_3076.xml
 IMG_3076.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3076.xml
 IMG_3062.jpg,1242,2208,text,74.0,179.0,159.0,29.0,iphone_IMG_3062.xml
 IMG_3062.jpg,1242,2208,text,76.0,304.0,490.0,54.0,iphone_IMG_3062.xml
@@ -9877,8 +9729,8 @@ IMG_3314.jpg,1242,2208,backgroundimage,1.0,49.0,1241.0,2159.0,iphone_IMG_3314.xm
 IMG_3314.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3314.xml
 IMG_3498.jpg,1242,2208,text,53.0,827.0,195.0,49.0,iphone_IMG_3498.xml
 IMG_3498.jpg,1242,2208,text,53.0,644.0,115.0,48.0,iphone_IMG_3498.xml
-IMG_3498.jpg,1242,2208,edittext,48.0,644.0,1147.0,75.0,iphone_IMG_3498.xml
-IMG_3498.jpg,1242,2208,edittext,48.0,827.0,1147.0,74.0,iphone_IMG_3498.xml
+IMG_3498.jpg,1242,2208,inputfield,48.0,644.0,1147.0,75.0,iphone_IMG_3498.xml
+IMG_3498.jpg,1242,2208,inputfield,48.0,827.0,1147.0,74.0,iphone_IMG_3498.xml
 IMG_3498.jpg,1242,2208,text,538.0,82.0,167.0,84.0,iphone_IMG_3498.xml
 IMG_3498.jpg,1242,2208,text,1049.0,104.0,115.0,40.0,iphone_IMG_3498.xml
 IMG_3498.jpg,1242,2208,text,453.0,268.0,335.0,43.0,iphone_IMG_3498.xml
@@ -9895,7 +9747,7 @@ IMG_3498.jpg,1242,2208,icon,61.0,85.0,85.0,85.0,iphone_IMG_3498.xml
 IMG_3498.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3498.xml
 IMG_3922.jpg,1242,2208,text,47.0,456.0,361.0,39.0,iphone_IMG_3922.xml
 IMG_3922.jpg,1242,2208,text,205.0,241.0,212.0,31.0,iphone_IMG_3922.xml
-IMG_3922.jpg,1242,2208,edittext,45.0,456.0,1153.0,77.0,iphone_IMG_3922.xml
+IMG_3922.jpg,1242,2208,inputfield,45.0,456.0,1153.0,77.0,iphone_IMG_3922.xml
 IMG_3922.jpg,1242,2208,textbutton,46.0,622.0,1151.0,162.0,iphone_IMG_3922.xml
 IMG_3922.jpg,1242,2208,text,325.0,839.0,596.0,43.0,iphone_IMG_3922.xml
 IMG_3922.jpg,1242,2208,text,798.0,241.0,270.0,31.0,iphone_IMG_3922.xml
@@ -9916,18 +9768,17 @@ IMG_3922.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3922.xml
 IMG_3711.jpg,1242,2208,text,124.0,1339.0,329.0,36.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,text,125.0,1170.0,115.0,37.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,text,63.0,106.0,127.0,40.0,iphone_IMG_3711.xml
-IMG_3711.jpg,1242,2208,edittext,73.0,1127.0,1098.0,121.0,iphone_IMG_3711.xml
-IMG_3711.jpg,1242,2208,edittext,73.0,1295.0,1098.0,121.0,iphone_IMG_3711.xml
+IMG_3711.jpg,1242,2208,inputfield,73.0,1127.0,1098.0,121.0,iphone_IMG_3711.xml
+IMG_3711.jpg,1242,2208,inputfield,73.0,1295.0,1098.0,121.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,textbutton,72.0,1463.0,1099.0,121.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,icon,1111.0,789.0,45.0,44.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,text,75.0,784.0,885.0,69.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,text,73.0,897.0,1049.0,180.0,iphone_IMG_3711.xml
-IMG_3711.jpg,1242,2208,modal,24.0,737.0,1195.0,895.0,iphone_IMG_3711.xml
 IMG_3711.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_3711.xml
 IMG_3739.jpg,1242,2208,text,93.0,307.0,267.0,33.0,iphone_IMG_3739.xml
 IMG_3739.jpg,1242,2208,text,94.0,448.0,180.0,32.0,iphone_IMG_3739.xml
-IMG_3739.jpg,1242,2208,edittext,91.0,307.0,1062.0,70.0,iphone_IMG_3739.xml
-IMG_3739.jpg,1242,2208,edittext,90.0,448.0,1062.0,67.0,iphone_IMG_3739.xml
+IMG_3739.jpg,1242,2208,inputfield,91.0,307.0,1062.0,70.0,iphone_IMG_3739.xml
+IMG_3739.jpg,1242,2208,inputfield,90.0,448.0,1062.0,67.0,iphone_IMG_3739.xml
 IMG_3739.jpg,1242,2208,icon,60.0,105.0,50.0,42.0,iphone_IMG_3739.xml
 IMG_3739.jpg,1242,2208,text,257.0,1158.0,727.0,88.0,iphone_IMG_3739.xml
 IMG_3739.jpg,1242,2208,textbutton,139.0,978.0,966.0,121.0,iphone_IMG_3739.xml
@@ -9940,19 +9791,19 @@ IMG_901450.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,47.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,icon,59.0,96.0,61.0,61.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,image,373.0,97.0,498.0,60.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,151.0,205.0,936.0,42.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,edittext,48.0,354.0,1147.0,169.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,inputfield,48.0,354.0,1147.0,169.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,136.0,417.0,231.0,38.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,edittext,48.0,570.0,1148.0,169.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,inputfield,48.0,570.0,1148.0,169.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,136.0,635.0,228.0,36.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,edittext,48.0,786.0,1147.0,169.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,inputfield,48.0,786.0,1147.0,169.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,136.0,848.0,302.0,38.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,edittext,48.0,1002.0,1147.0,169.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,inputfield,48.0,1002.0,1147.0,169.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,136.0,1064.0,207.0,39.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,edittext,48.0,1218.0,1147.0,169.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,inputfield,48.0,1218.0,1147.0,169.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,136.0,1281.0,163.0,47.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,edittext,48.0,1434.0,1147.0,169.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,inputfield,48.0,1434.0,1147.0,169.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,136.0,1496.0,131.0,38.0,iphone_IMG_901450.xml
-IMG_901450.jpg,1242,2208,checkedtextview,48.0,1673.0,1042.0,110.0,iphone_IMG_901450.xml
+IMG_901450.jpg,1242,2208,checkedview,48.0,1673.0,1042.0,110.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,text,207.0,1678.0,883.0,96.0,iphone_IMG_901450.xml
 IMG_901450.jpg,1242,2208,textbutton,48.0,1991.0,1146.0,170.0,iphone_IMG_901450.xml
 IMG_3507.jpg,1242,2208,icon,1112.0,90.0,69.0,71.0,iphone_IMG_3507.xml
@@ -10005,7 +9856,7 @@ IMG_2627.jpg,1242,2208,image,967.0,808.0,116.0,371.0,iphone_IMG_2627.xml
 IMG_2627.jpg,1242,2208,image,874.0,353.0,237.0,398.0,iphone_IMG_2627.xml
 IMG_2627.jpg,1242,2208,icon,527.0,104.0,43.0,45.0,iphone_IMG_2627.xml
 IMG_2627.jpg,1242,2208,image,1119.0,101.0,66.0,51.0,iphone_IMG_2627.xml
-IMG_2627.jpg,1242,2208,edittext,24.0,78.0,1194.0,97.0,iphone_IMG_2627.xml
+IMG_2627.jpg,1242,2208,inputfield,24.0,78.0,1194.0,97.0,iphone_IMG_2627.xml
 IMG_2627.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_2627.xml
 IMG_1312.jpg,1242,2208,text,431.0,104.0,384.0,54.0,iphone_IMG_1312.xml
 IMG_1312.jpg,1242,2208,text,33.0,233.0,469.0,46.0,iphone_IMG_1312.xml
@@ -10072,5 +9923,5 @@ IMG_2632.jpg,1242,2208,image,434.0,2092.0,64.0,55.0,iphone_IMG_2632.xml
 IMG_2632.jpg,1242,2208,image,742.0,2088.0,67.0,53.0,iphone_IMG_2632.xml
 IMG_2632.jpg,1242,2208,icon,1054.0,2085.0,65.0,65.0,iphone_IMG_2632.xml
 IMG_2632.jpg,1242,2208,text,1026.0,2174.0,122.0,24.0,iphone_IMG_2632.xml
-IMG_2632.jpg,1242,2208,edittext,84.0,73.0,900.0,108.0,iphone_IMG_2632.xml
+IMG_2632.jpg,1242,2208,inputfield,84.0,73.0,900.0,108.0,iphone_IMG_2632.xml
 IMG_2632.jpg,1242,2208,uppertaskbar,1.0,1.0,1241.0,48.0,iphone_IMG_2632.xml