* 28f8d7c (HEAD -> android-studio) V1.97 Fix CQ4 add tag | * c99bcc3 V1.97 Fix CQ4 add tag |/ | * 14d981f (origin/android-studio) V1.97 Fix CQ4 add tag |/ * a37d74b V1.97 Fixed search loading click action * cf2010d V1.97 Fixed play battle select answer padding issue, * 973a1c3 V1.97 Fixed nearby crash, Upgrade GP library to latest V9.4.0 and rewrite nearby class most of APIs was deprcated! | * 7600ece V1.97 Fixed nearby crash, Upgrade GP library to latest V9.4.0 and rewrite nearby class most of APIs was deprcated! |/ * 640102a V1.97 Fixed add tag with A2.7, link open WWA tag with name and lngAbbrevation * 7ccfec9 V1.97 Fixed 9patch battle select bg images, * f3afc55 V1.97 Fixed update token after expire, * 2fde321 V1.97 Fixed battle alts click blurry whech choose ans, * f2a042d V1.97 fixed toast quizking icon size for large screens, * 5517861 V1.97 After review the 4th q, the swipe left shall go back so no need for clic on upper corner back, Enhanced CQ wiki swipe like wwa * e35921f V1.97 Fixed Battle review freezing with some cases, * b94e48b V1.97 fixed chat btn unseen msg count position on tab7 & tab8 * daff155 V1.97 fixed Battle review design issues for tab7 & tab8 * 85ffbe1 V1.97 finished refactoring of ConnectionLayer and fix API conflicts, * c1c5389 V1.97 Refactoring connectionLayer and APiURL enum with APiManager * 28179f1 V1.97 fixed Way to big fonts in Create Q (CQ1 ) in Question input : Better proportions needed * 8ccbe89 V1.97 Fixed profile btns alignment, profile show wok flag until loading WOKer profile and display his contry flag. | * 67996af V1.97 Fixed profile btns alignment, profile show wok flag until loading WOKer profile and display his contry flag. |/ * 0700f8b V1.97 align progress loading on sub header profile to align center vertical, enlarge text under chossen category for large screen, * 9c39a7d V1.97 Fixed default category icon size quizking icon same icon size after loading, add loading progress on default icon until loading category icon, shrink text size on same tab8 screen was vlarge, * a213c09 V1.97 Fixed battle counter start before display alts, * 5cfd2d2 V1.97 fixed category blurry issue * 5df8fb8 V1.97 fix scoreboard design issue, * 3edd443 V1.97 Fixed Qestion image left alignment * 1ebb2a7 V1.96 Handled show battle question with image,Fixed when alts less than 4 crash,Handled wrong answers to the Questions issue. * d25e21e V1.96 question image size fix * ca7d35c V1.96 implemented battle with image * 4c41422 V1.95 fixed start battle issue, empty battle * 32efbc3 Fixed login email space issue, empty battle issue * d40c272 v1.94 https --> http | * 67c91ca v1.93 https --> http |/ * 981a6c3 Fixed facebook login issue, battle review clickable profile * 5ff995b Fixed facebook login issue v1.92 | * 6ad5677 Fixed facebook login issue |/ * 5ee1dda Fixed RQ add tags issue V1.91 * f46da23 tag module fixes * d55aa11 RQ add multi tags onprogress * f046f54 Fixed design issues * 8dc81c0 Finished RQ add,remove tags pending for serverside part tobe finished! * 6975129 Design fix * 518a7a7 Merge M61 changes with Using deeplink action to open WWA profile and wikipedia |\ | | * 2053be3 Merge M61 changes with Using deeplink action to open WWA profile and wikipedia | | |\ | |/ / |/| / | |/ | | * e78c4fc Merge M61 changes with Using deeplink action to open WWA profile and wikipedia | | |\ | |/ / |/| / | |/ | * 1e83c36 MEN connected with WWA | |\ | * | 998d95b add resources * | | 50228d9 Use DeepLink URI to handle open WWA profile and wikipedia V1.89 | |/ |/| * | 5090b42 update gradle file * | 52f66af fix chat home crash |\ \ | |/ | * b992af1 Design issues , chat crash, chat push notification | * 9c545ae version number increment | * 07440b7 fix start battle | * 3c4656d fix main screen issue , profile design issues on all test devices, battle review swipe issue. | * cdadd9c fix challenge font size | * c97f006 fix battles cashe bug | * 64938bc fix push notification avatar not display some screens | * 65e43e9 fixed update avatar bug & fixed giveup bug profile for tab7 | * cacca4f fix avatar issue | * f774801 Merge branch 'android-studio' of https://git.wokcraft.com/wokcraft/QKA into android-studio | |\ | * | 3bcff6a fix scoreboard issues * | | 35f6387 local changes | |/ |/| * | 5c93801 change submit Q path to question && fix folow unfollow woker,chat fix |/ * 9699b57 moved to AP2.6 && design issues fixes * 1aee9f6 fix profile font size * 3cc34fb fixed design isses && merge |\ | * 94e0388 change swipe battle review to each view | * cefb09a add serialized name class | * 222d43b remove platform from fb login url param | * ca190fb add aptype & appversion and platfor to signup and fb login process | * 61685f3 upgrade main screen list view & profile design issues && login screen design issues && clean old dependances * | af7b2fa finished avatar module |/ * 752747d update chat design resources * 4f80777 finish chat with API2.5 * bad6b76 implemented chat , main screen battles return to same position , update local cache with any updates ,, enhance cache onprogress * f620e97 Chat with new api&& main screen battles changes! * d125e39 Implemeted chat with new api * b2d215a fix CQ4 remove tag issue, fixed RR add tag issue * 40dc040 Merge branch 'android-studio' of https://git.wokcraft.com/wokcraft/QKA into android-studio |\ | * e3f3919 edit profile on off switch | * 6911b4d fixed CQ4 remove tag issue , update terms url | * cfdcb74 worked on CQ4 add single tag , remove tag | * 8aac394 fix share action | * 2a058ba fix chart freeze && token mismatched login fail redirect to home screen * | 56cc372 change push notification chart flag |/ * 0de8ce4 Fix change passwword keys * 7a43b7c Fixed no internet connection issue, enhance loading put on header and not fraze screen any more, prformance enhancement for load battles on main screen * df56520 fix load on top battles * 7212344 fix battle revicew freeze , enhance loading in some screens , fix profile category wokbits and top battles services * 0356c7a Share action,country flag on profile, design improve , Version 1.67 * 4857ea1 fix login error dialog issue, fix profile crash , fix submit battle nx value * fb682a7 add loading with login sceen * ee61b62 clean string translation , language flag to right, performance improve * b485c69 flags, design and fix bugs * b23c47d working on battle flags * 438f9fc change app version number * defa218 Merge branch 'android-studio' of https://git.wokcraft.com/wokcraft/QKA into android-studio |\ | * 351696a fixed search woker issue , fixed cq wiki crash * | 90e9af4 change login,signup screens , enhance main screen battles loading action, change progress dailog to progress bar on rounds and profile screen |/ * 38c6d77 update string text NOW, wrong username & password text * 7de75b6 after validate question submittion and rounds screen fix main screen dates * b3435b5 improve QKA connection layer, fixed submit question by question issues * 79e6e4d Fixed cheat issue by submit Question by question * 9f117c0 Moved QKA to API2.5 * 3e04fbc add version in seetting && fix chat bugs && fix share facebook setting help bug * 3975461 fix chat text align * af7dbc1 fix chat issue * d46dd73 enhance login screen & chat & main screen battles >> design and performance * 0839dc1 fix fb login to secure and fix chat * b10da14 - Implement question by question submit (Not finished yet) * fd873aa archive battles, Deprecate autologin, archive chat history , enhance chat skype style * e160134 Merge code before check facebook get friends crash! |\ | * f9f94ad fixed new login design | * 1681f3e - Lollipop compatibility issue. * | 19407db facebook manager changes |/ * 6e8f103 ignore facebook search character case4 * 899d970 Implemented login with animation & convert fb&uil to gradle * 1d538fd Merge branch 'android-studio' of https://git.wokcraft.com/wokcraft/QKA into android-studio |\ | * dbce821 Moved list languages & categories services to A2 fixed chat spin issue. | * 5dec32b fix start battle with shake when return with empty woker bug. add device id when register access token with login. | |\ | * | b9ad4e2 UIUtil changes! * | | 31d8b2b change push notification param | |/ |/| * | 862ffc3 fixed facebook bug * | e104075 include battle will be in language xx and fix choose category issue |\ \ | |/ | * cf63c03 fix scoreboard time filter issue contect wwa tags feature | * 1bf3716 lowercase languages names! | * 4489648 fix swedish battle different language text,fix change app language crack backstack | * 30fb85f Finish batlle will be in Arabic dialog! | |\ | * | b6b5ef4 fix stucture code on local machine * | | 5fd9fe3 edit profile country state city changes! | |/ |/| * | 7275291 implements anonymous and Loading text shall be purple and font used in app * | 42b5a33 - Implements Anonymous feature . Done. - Fix on/off buttons show in scoreboard/map . - Loading text shall be purple and font used in app * | ab52da7 Fix Round bullets crash when open battle has no status. * | c0b4e47 Fix when random return current user hide button layout * | bce9208 Enhance CQ-wiki swipe action * | 63fc7e9 Remove notification when on bullets screen. * | b3e2cdd Fix change play button state on rounds screen when swip from chart screen. * | de497db Fix start battle from round bullets after register new WOKer * | 5ff4d1e Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio |\ \ | |/ | * 3873c8b Scoreboard Keyboard issue Map Crash Swedish translation | * 838ca4b Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | |\ | * | e7924a8 fixed Battle Review graph * | | 0602011 fix facebook login issue , stop push notification when logout | |/ |/| * | e77161d Fix search WOKer trim space |/ * 8132f9b merge MN code |\ | * b6ac234 fixed Categories dialog in profile details fixed keyboard hides search results * | a0eaede Implemented RR API with last update date,loading main screen update,fix invite frind issue |/ | * 6b4173e fixed Categories dialog in profile details fixed keyboard hides search results |/ * 9fbaf4a fix battle review , top battles , push notification scroll down issue * 7bb4816 changed scoreboard to fix keyboard hides search result ,not fixed yet * 6dc1925 change logout intent flag * 793ff3d fix back with round, chart screens * eab697c fix back close menu issue! * f3b0bbe Merge MN chagnegs |\ | * 935fc4d center facebook friends * | 2bb9502 Fix logout issue , Add switch xml sry MN for ensure added BUT it's not. | | * b6d7cd2 center facebook friends | |/ | * d08fc13 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | |\ | |/ |/| * | 6c544cb Fix edit profile switch button * | dd9a6d3 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio |\ \ | * \ 55d63e1 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | |\ \ * | | | d0a8d45 Fix show listener on back | |/ / |/| | | | * b50b42c Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | | |\ | |/ / | | / | |/ |/| | | * a848ddf Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | | |\ | |/ / | | / | |/ |/| * | b69d0e2 fix onhide listener changed issue for map and scoreboard | * eca140d Scoreboard padding issue,dialog category height | * e2c6c1e Scoreboard padding issue,dialog category height |/ * e847637 fix app did not exit hide show on edit profile, hide change passwd when fb * ad93845 Set default switch values true show/hide feature * 77be206 - Add show on map and show on scoreboard settings * c1f0933 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio |\ | * 769d6c4 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | |\ | * | d8a016c Fix forget pasword * | | dd30743 add missing files | |/ |/| * | 9f500aa Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio |\ \ | |/ | * 35613d8 show_hide menu scoreboard | * 88efa53 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | |\ | * | f96f816 top_battle xml change * | | 1afa30a toast transparent background,search field | |/ |/| * | 1f56e57 1440 and 480 design issues,save question when app exit and restore it again - not tested well * | 9431be6 erged with KL |\ \ | |/ | | * 8629816 added ApiURL.java | | |\ | |_|/ |/| | * | | 6cad21e fixing .gitignore * | | de8295b nothing | | * cec63b4 merged with KL | | |\ | | |/ | |/| | * | 53f8657 Top battle score | * | 5ded456 fix MC profile issue | * | c9af505 QKA 1.38 Release | * | 141270d Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio | |\ \ | * \ \ ef736c6 After merge MN code And add MC profile | |\ \ \ | * | | | d576f99 Finish profile MC | | | | * 520fc45 fixing .gitignore | |_|_|/ |/| | | * | | | 55acf54 fixed 1440 edit profile,profile details,start battle,create question,menu * | | | 1be3b1c fixed 1440 edit profile,profile details,start battle,create question,menu | |_|/ |/| | * | | 1204680 1440 and 480 desing issue date 150317 | |/ |/| * | c8971c7 Merge branch 'android-studio' of 54.247.94.35:QuizKingAndroid into android-studio |\ \ | |/ | * b1bbbe8 add help image jpg * | d4834a0 after removeing gitignore file * | 0c5882d clic, clic when add tag in CQ4 replaced help images |/ * 4a04c06 merge with KL |\ | * 54f7960 change help screens | * 3a7ad99 First commit android studio! * | c1ba74e add all to git * | cba28af XFactor issue 1440 design issues * | e231cec XFactor desing and issues,1440 design issues |/ * 8c50a67 initial commit after converting project to android studio * 7ad307d (origin/master, origin/HEAD) comment toast when no internet connection with periodically check * 21e878f Fix redirect to round or chart if server return with error. * 5c5aab2 try-catch crash OnSwipe onFlip.. * 81d3fa0 remove chat input align * 9a605c8 Enhance Chat, Map. * 8b611fb When id not return from server add.else remove * 83f1880 Fix chat crash, fix chat pull duplicate request, fix chat receive same message every time. * 93099d7 Merge MN code add .gitignore, MN may delete ...!!! |\ | * 855ed67 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | | * bb26fb1 Extra wokbit on overall RR. | | * dc3f60f "4 in a row! 100 Wb added!" | | * 33840a5 Change swip to right with Chart review! | | * 1286764 Fix Nearby crash, RR swip left chart review! | | * bf35704 Enhanced swipe comfirm wiki CQ1. | * | dd7f997 480 profile,QR ,RR,city issue on profile | |/ | * da4e5a8 Merge remote-tracking branch 'origin/master' | |\ | | * ccd1434 Fix Nearby user duplicated | | * f8a68c5 delete project.properties | | * 0710baa Merge branch 'master' of 54.247.94.35:QuizKingAndroid | | |\ | | * | 1ccb2e0 Fix round review failure message | * | | 19bd084 design issues 1440 | | |/ | |/| | * | 35409af fixed swedish date format | * | d9acbae category item margin | * | a81878c Merge remote-tracking branch 'origin/master' | |\ \ | | |/ | | * c6e24d1 Fix battle language id | | * 7e6bbf5 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | | |\ | | * | 5a7cf51 Fix Map issue, Fix Scoreboard category issue. | | * | 650fd06 Fix RR to RQ click issue, | * | | 47cc354 Fixed Language issue in Create Question,Design issues | | |/ | |/| | * | 07a3b70 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ \ | | |/ | | * cc390ec Fixed CQ wiki swipe action. | | * 64fff13 Enhance swipe action. | | * bb245fa Merge MN code after he change language spinner # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. | | |\ | | * | b6a0db2 Fixed display state,Main screen empty | * | | 43284bc language issue,rounded selected categry,design issues | | |/ | |/| | * | 433fee8 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ \ | | |/ | | * 671933f Fix facebook, change edit profile country , city fill. | * | 4eb0910 changes login buttons , fixed map issue,changes languages lists ,fixed design issues | |/ | * 7eaf0aa Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | | * b4be2fe add create new question | | * 51c707c Change update language first time. | | * f551aef Update home screen back from push notification | * | f3071a0 Increase Start battle buttons width | |/ | * c983696 Question Step 4 | * 1f5331a Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | | * 9408fd9 Fixed facebook crash when share | * | d4cb9e4 Categories in 480 rounds in 480 * | | 35b2e75 project properties! | |/ |/| * | c9e452d Fix Battle issue! * | 9ea4991 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 622b3e8 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * | 64e8688 category search field scoreboard buttons space languages adapter Question Review * | | 2fb6264 Fix turn dialog. | |/ |/| * | 302c9e5 Fix Home screen with scroll, * | 0247c4f Fix cq issues and push notification, main screen. |/ * 4c0812a Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * 475d7c6 Add footer loading, * | 694279e Map issue Fix change user avatar issue |/ * 2a451f0 change message in cq4 until handle backend issue! * 013fb6a Merge branch 'master' of 54.247.94.35:QuizKingAndroid Merge MN code |\ | * e4665b9 Remove Shadows from Buttons change Scoreboard textfield background | * 48a9c9d Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * \ afeb384 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ \ | * | | 6f49740 Select Answer Background Scoreboard rank Start battle buttons in 480x800 * | | | 9475f71 Fix create question issues | |_|/ |/| | * | | d33f433 dialogs changes! | |/ |/| * | a3c6548 Upgrade simple fb lib, fix invite fb friend ,animate dialog |/ * 93602a5 Create Question and Wikipedia tag and link (480,720,1080) design issues * b978f44 design issues (720,480,1080) * 367a4a9 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * c8d9af1 Fixed Main screen Not response with arabic GUI. * | 770ad3e Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 57ea7b5 change help screen duplication | * c88ebcb Add chat changes! | * 74a9008 Fixed header data issue | * 7ec86b5 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 2b95f45 add dp px util * | | 180df0c design issues for 720x1280 (Battle Review,Chat) | |/ |/| * | 4785e7c Keyboard hides buttons issues 720x1280 xhdpi issues |/ * 35b3c35 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * 42d003f Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 50e3827 Fix chat, win/play adjusted issue * | | 41a0da4 fixed POST,PUT and DELETE requests changed 1080x1920 Buttons fixed issues in 480x800 | |/ |/| * | 081cc99 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 833e2c7 include turn index in turn loop | * 5853aad fix timestamp in main screen battle issue | * 52330e5 Fic turn battle ontop again deleted by Merge. * | a489505 480x800 buttons and edittexts background |/ * 0359c2c Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * 2c81ae1 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | | * 63f08d7 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | | |\ | * | | 2d474a2 fix turn ontop issue | | |/ | |/| * | | 2bd978e Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ \ | |/ / | | / | |/ |/| | * c74ba5b Fix create question category issue,chat issue * | bf812ef Create Question Screen Choose Category height divider * | d1f9015 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 3032948 fix battle feeds sorting issue! * | 916faa7 toast text font size divider height in S4 |/ * 268ee24 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * cf695b3 Update main screen header on the fly with any now updates * | 531a273 Merge commit 'd53881c2afb5533dec02175bd3447c1b9ce59dd6' |\ \ | |/ | * d53881c Move Main screen battle feeds to master API, fix signup link issue, round review tag issue | * d3b61ea After fixed git server issue with KL changes! | * b2bfe1c Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | | * 1c059ac Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | | |\ | | * | 0df51c6 Commit after using mac | | * | d18bb45 480x800 Design | | * | 87c9ea9 Continue on 480x800 design | * | | da35461 Rollback Main screen battle. fix add wikilink round review | * | | 6d2e200 Change main screen battle with date still need some work! | * | | 2206ca3 manifest changes! * | | | cb3da58 fixed some tablet design issues * | | | 814e8a2 Tab design issues,begin to design 1440x2560 * | | | a73fa7f fixed design issue 480x800 and 540x960 * | | | 1a1169c Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ \ \ | |/ / / | * | | 72e0ae9 Location changes! | | |/ | |/| * | | 7ad33b0 integrated my old code with KL's code |/ / * | 605cce8 Add dialog changes. * | 4a4e95b worked on alert dialog. |/ * 50cb569 Create question separation. author show profile ...others * b9178f6 Fixed some issue.Push notification new replace old in the same battle * 0a6930a - GD 233 : Finished Wikipedia search depend on user create question language. - GD 228 : Move question alert to A2. - GD 231 : Worked on Complete help screen header and add new pics * 0423c02 Move alert question to A2, Fix category icon size. * 9ef747f Sort Finished Battle to be Bottom of screen all time. * 08faf34 Merge remote-tracking branch 'origin/master' |\ | * 5547b85 Fix create question, round review tags and learning link, | * 8196ccf fix alert button issue | * d52a043 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | b057a12 Fix Create question issues. * | | 882c239 finished 600x1024 resolution | |/ |/| * | 091fd49 600x1024 Reolution (not finished) * | aa5d05a Merge remote-tracking branch 'origin/master' |\ \ | |/ | * 59930fc Merge MN design changes, create question, wiki tags link round review. | |\ | * | 117b06d Fix create question ! | * | d750b07 Enhance showing bullets, cache date open other screen. * | | 9c81146 finished 720x1280 design | |/ |/| * | bfe0d71 720x1280 design issues * | 8b46c41 Merge remote-tracking branch 'origin/master' |\ \ | |/ | * 4bea3a6 Fix bullets issue. | * 854b581 Fix change language dialog. * | 0168b06 Round details design screen in 720x1280 Battle Round Design |/ * 5a5859b Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ | * 861f119 Fix review with all bullets, fix duplicate turn battles issue, enhance create question change language dialog. | * 8a64e26 Fix create question issue. * | 4d30d71 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * b9242d8 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 61fb32f Finished sync categories , language from server. * | | e04734a fixed design issues in tablet 10.1 and s4 devices | |/ |/| * | 5e5de15 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 9d63f52 After change category load from cashe | * 95388f2 Store categories.before display from cashe. | * 28ca3c1 Some question changes. | * 6f84cb1 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 27d251f highlight create category selection * | | a104173 fixing design issues in 720x1280 | |/ |/| * | 50eeaaa Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 4af7c5f Merge MN code. after fix wikipedia search. | |\ | * | afa9acd Fixed create question Wikipedia search * | | 2aa5e25 fixed issue in 1080x1920 fixed issues in create question | |/ |/| * | fa5888e Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 12f3eaf Enable German, some fix,, fix profile crash * | 89f9aa0 fixed design issues |/ * d688205 design for Note 4 * 92a6ff0 make some fixes. * 264d9da Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ | * 7f7e12a Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 8b76eb4 changed xxdpi to normal-xxdpi * | | 03da28f Fixed xfactor issue. | |/ |/| * | 2a8f750 Comment ads code to release without ads. * | 5511b59 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 02f2f72 Merge remote-tracking branch 'origin/master' | |\ | * | 3c005b1 Finished Resolution 720x1280 but not validated Finished Resolution 480x800 but not tested * | | 5be0c0a Added localization for German,Portuguese (Not translated yet). | |/ |/| * | 98c1c79 Finished swedish language. * | d502009 some changes battle activity * | dcb1939 Implement XFactor * | 92476a9 Finished animate battle, sounds effect on main screen, * | bf50749 Remove Flip lib, * | cd800f8 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * edcecd3 categories margin * | a7b3f59 Comment ads code |/ * 796db9f Merge MN code with hide head to head when current user profile. |\ | * 5748798 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * | f20daa9 Finished Resolution 720*1280 * | | 422d8cf Hide head to hide from profile details --- (When user profile.) | |/ |/| * | 2b573ac - Add keyboard action done login, register screen. - handle push notification arabic text message. - Enhance main screen battle feeds. * | bf1afde Handled push notification,add loading progress with WOKer search * | 1272f11 Merge MN code ,with push notification . Conflicts: res/values/strings.xml src/com/wok/common/ui/BaseNavDrawer.java src/com/wok/ui/util/UIConstants.java |\ \ | |/ | * 6edf6ea 1- Refactored In-App Purchase code and now we have only on Singleton class (InAppPurchaseManager) manages all purchase process 2- Implemented Settings Screen in 720*1280 Resolution 3- Show all categories after purchase process completes successfully | * fd763e9 In-App Purchase ,implement onActivityResult and Security also send data to server * | b41a0b6 Finished push notification. * | 280e1d9 Update GCM token, complete ads. |/ * b551c71 Merge MN code with push notification . |\ | * 0cd1154 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * | 1d67170 In-App Purchase Send Purchase Data To Server * | | 0d0d75a Finished push notification. | |/ |/| * | d26c41b Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 904ae85 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * | 6aeb23d Change In-App Purchase Licence Key | * | ce9622f Chat dublication issue Create Question Exception and cancel button * | | 400160c Fix navigation bug, worked on gcm. | |/ |/| * | 843f85f fix chat btn, add unread chat message. * | c81f1be Fix scoreboard issue,fix navigation issue. |/ * 2f5fabd Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * 598d99f change splash logo place. * | 6fcd54b Create Question with Wikipedia Resize Text box issue Chat timer Issue |/ * 0112617 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * a9fc8eb fix bugs ,enhance arabic text, enhance some layout for small devices. * | 7d09348 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * eb98053 Fix faacebook logout issue, add arabic splash,login logo. | * 0dd7e68 Merge MN changes, Fix chart crash. | |\ | | * eca2954 change text cursor color search Screen padding | * | 240c231 handle all fragments animation with open,back! * | | 7335018 change text cursor color search Screen padding | |/ |/| * | 6ddaba0 Fix Facebook issue when user not accept permissions fix Chat Edit Box focus issue * | 0981b93 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 1290b76 Fix change menu after back pressed! | * e2a7407 Waiting after login, fb login ,sign up .. while initBattleFeeds using progress dialog * | 1bde9a7 change Image View in Edit Profile Screen to Circular Image View |/ * f92e0d5 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * 550c145 Splash screen small fix * | b239d30 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 33c51e3 Fix chat dupicate issue,display msg after sent, Back over all app on BaseBackPressedListener | * 80d1cf9 Merge MN changes, Fix back over all application.. fix sign in , sign up back issue. | |\ | * | 52ca295 Fix back issue over all application, * | | a233f9d Chat Resize screen keyboard opens in Edit Profile | |/ |/| * | 1bcd7b3 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 83fb027 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | baec447 No updates | * | 7deafae Fixed battle review head to head * | | 80e0ea2 Change User Image in Edit Profile Screen | |/ |/| * | 2977270 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 0db85bf Some chnage battle review, main screen, round acttivity | * 1342c3e Fix crash when open menu reported by google play,Fix back from login screen exit app, fix reset password and chanage password. | * 60e4a8f update versionCode to 6, name 1.01 | * ec7756d Fix chat back issue. | * ddc05f8 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 7832912 Fix chat task not cancelled * | | 3724e79 After merge * | | 7c67ecf fix Change user image issue | |/ |/| * | d3641cd Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 222bfaa Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | fbf47a9 Fix some bugs * | | fdf180f nothing important | |/ |/| * | b2641bd fixed battle issue in fifth round * | 4934416 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 36d1804 Fix network change reciver, fix some bugs battle,round score screens, fix exit application issue on some activities | * 5dd6d35 Add arabic categories | * 95001a9 Fix battle crash header status not set,start peroidic check turn after load result. | * a7e80a5 Fixed battle onfinished status not set in header. | * 63b08ef 1-Some arabic text not translated. 2-Fixed Nearby Map not work. 3-Fixed QKA did not exit after user choose exit. 4-Handled some crashed on play battle, alert user with different battle language. | * 20a5265 change min sdk to 13, add scroll view to signup * | ff8ce28 started implementing Google Analytics |/ * f29ff41 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ | * 9f21776 Fix scoreboard with battle filter user place. | * ff2e1e3 Fix Card flip with old versions. | * 1810a71 Handle cached round submittion, Fix Card flip. | * 865256a Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 7a64e35 Change play battle animation.. * | | cb7167c handling all network requests (check internet connection and response) | |/ |/| * | 60869bb Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * a62b36f start battle service from onrestart | * 9e825d7 Fix scoreboard with battle filter * | 2e04d48 ProgressBar background Text Algin in Question and answers answers selected background * | 6eabb60 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 11b33b2 change battle flipview controller. * | 509d0bf fix invite facebook friend issue selected answer background |/ * 773d5d2 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ | * 83b1000 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * \ e11c6e6 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ \ | * | | e0fc80a design for Help Screens fix chat duplication messages open "other apps" on Google Play logut issue * | | | ff96a4d Fix login update language issue,fix choose category issue. | |_|/ |/| | * | | 35a0264 Fix start battle from rounds screen | |/ |/| * | 32e1115 Fix update application language, home screen battle feeds. * | 4ada149 Finished update question language in signup,ui and fix random woker with same user language. * | 934e918 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 76e7372 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * | fa9119b In-App Purchase Dialog select answer background * | | b50af35 Fix fliker issue. | |/ |/| * | a330733 Finished chosen category on play battle, add network changed interface. |/ * c96b126 Merge remote-tracking branch 'origin/master' |\ | * b3e240d Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ * | \ 3d0d6aa Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ \ | |/ / |/| / | |/ | * e479aa5 handle question lang , alert user battle stored different lang. | * a49bfdf Merge MN changes,Main screen battle feeds,splash ,scoreboard fixes Conflicts: src/com/wok/common/ui/BaseNavDrawer.java | |\ | * | 341637b Fix scoreboard focus color issue, | * | 586523e Fix main screen feeds,add NetworkStateChanged * | | 5d87f95 fix missing arabic text in strings file * | | c0e9af5 help screenshots ,categories design | |/ |/| * | c11fc51 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 296b52d Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 17f66ff Fix main screen turn issue. * | | e6fc7fd Send Comment , Battles filter in Scorboard * | | 29c5786 merged code with KL | |/ |/| * | 4bb44de Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 97ca068 Merge MN code with main screen turn feature. | |\ | * | a71a04c Fix Main screen turn issue | * | fe54fe5 Fix round review issue * | | 8081a8f Map markers | |/ |/| * | 34f2a8d Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * d37d431 Fix start battle time replace with timer and timer task. | * a0f37a4 add missing res files | * b0b60ec Merge MN Code,Fix round turn ,fix back with round review issue. | |\ | * | b0ec69a Implements Question report. | * | 4911184 Fix play battle adapter * | | 73ba207 Create Question With Wikipedia API * | | 91b4559 facebook friends search | |/ |/| * | cc5376a Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 907b27a Fix slpash issue, battle flip | * 4272105 Set connectcion timeout, change battle counter, add User answered date. * | 625d80d Nearby Map Screen and small change in menu * | 5558359 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 64293d1 Fix issue in round review, battle chart review and play battle | * b4d6623 Ignore bin folders * | 829efae Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 73203a0 Merge MN changes,, KL to MN please ignore bin,.gitignore,project.properties. | |\ | * | 7f70792 Fixed Battle review chart graph background issue, some chat issue * | | cdeacb1 finished design issues with EB | |/ |/| * | d6c0ef4 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 5b937a3 Add mulitLanguage support | * 44e7f89 Fix GMT time, add change fragment,activity to BaseNavDrawer activity. | * 71b95fa Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | dfc4011 Fix battle timer issue, add x-factor,add back chat screen * | | c70af72 battle screen design issues | |/ |/| * | 92b97df Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * cb026ef Merge branch 'master' of 54.247.94.35:QuizKingAndroid Change battle,navigation, animation | |\ | * | 9554c23 Change battle scenario,round preview ,add navigation and animation * | | 8cebdc4 Create Question refactored | |/ |/| * | 8cc7724 chat date * | d441207 Implemented Chat * | c7ce03f Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * b6c2fc2 Merge MN Code. | |\ | * | 5e02a0c add pull to refresh lib files. | * | 5b3f06a Finished edit user profile screen like MR new design * | | 700948b Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git * | | 9c82fb2 Refactoring Facebook code | |/ |/| * | 933239d fixed issue and start to refactor facebook code * | 760aaa0 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 4f3038a Merge branch 'master' of 54.247.94.35:QuizKingAndroid Finish battle wall loading. | |\ | * | 1b0036c Finished Add/remove woker,wall loading action like facebook. remove graphview lib, * | | 01114a4 added simple facebook sdk | |/ |/| * | 1b2944a after merge with KL * | 3d456a1 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 2134191 Move Categories,Languages and countries to applib, finished scorboard,change some UI * | aeb771f create question with wikipedia and slider * | ebaf356 Integrated In-App Purchase * | e415a0e Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 5fc5536 Merge MN code, | |\ | * | f678d9a Add random battle on shake,change login layouts, scoreboard design. * | | cb3e634 change color of first question in round screen | |/ |/| * | 278d190 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * 661ad66 Fixed missing files from layout | * 6b372e8 Merge MN code and fixed missing files. | |\ | * \ 185e459 Fixing Missing files from MN commit. | |\ \ | | * | 31a0d30 Fix missing files from MN commit | * | | 35f1f28 project.properties | * | | 04545bf commit project file | * | | 352d42a Add gitignore file | |/ / | * | 164a748 Add achartengine charting lib, * | | 384bb4a nothing important again * | | b83e9e3 nothing important * | | e999e9b Signed-off-by: Mahmoud El-Naggar * | | 8845471 fixed issues in start battle * | | d68881a display nearby wokers on map and start battle with clicked one | |/ |/| * | 25af502 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git |\ \ | |/ | * bc648cc - Fixed scoreboard, create question title issue. - Added user image to scoreboared list. - Worked on battle review chart. * | acd7fef nothing * | 35031ce semi merged my code with KL |\ \ | |/ | * ef021f0 Fix conflicts. Conflicts: app_lib/QuizKingLib/src/com/wok/model/Battle.java | |\ | * | cfe0aa1 Sort battles list by last modified date and user turn. Changed ring color and battle status text depend on battle status * | | f7217e7 Revert "fix Start Battle Bugs" * | | 567b7a2 nothing important * | | 3db91e6 fix Start Battle Bugs * | | 951a5ab Fixed bugs in Start battle scenario | |/ |/| * | 49108b9 Fixed Fragments Custom Constructors issues |/ * a257039 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ | * 8125897 start previous rounds | * 9be5051 merged my code with Khalid's | * 5635939 finished create question | * 4f67495 finished facebook Signup Api 2.0 | * 01564be 1- Submit battle 2- Facebook Signup with API 2.0 * | c6c3382 Add grapview add modify main screen battles. * | d7d7bc0 Finished update user data, location and cities. * | ec4e7b9 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 9f03147 Merge my code with KHalid's | * 7967f1d Revert "worked on start battle and displayed random categories " | * 1198c0c BattleActivity.java for current battle | * 89bf326 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | a1fc041 nothing new :( | * | b6722a3 nothing new :( | * | 2d7c794 worked on start battle and displayed random categories | * | 1f56d8b Finished Search About Wokers * | | e8c1a75 Delete redundant xml files | |/ |/| * | fc97677 Finished Profile details from random woker, ScoreBoard.. * | 1c049b2 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * 016deca almos Finished Facebook invite friends * | f557246 Merge branch 'master' of 54.247.94.35:QuizKingAndroid |\ \ | |/ | * e1b99b8 1- facebook login using alpha api but not finished yet 2- check round user turn before open round info | * 7826417 finished displaying round info | * 98431c8 finished design round details ui * | c66fe72 Add finished round info code. |/ * d089b77 Add all files to ensure PUSH all changes. * 93022db Merge MN updates and solve conflicts |\ | * 0cdb850 update user image enahncments and fix bugs | * 0ae4377 add UIL Library | * 7dcc6f5 Merge branch 'master' of ubuntu@54.247.94.35:QuizKingAndroid.git | |\ | * | 7285bd7 finished using signup api v2 * | | 1935e89 Finished round review. singleInstance activity issue NOT fixed yet. | |/ |/| * | 6ee0c34 Finished list user battle. |/ * 445b62d Add lib changes which ignored before. * 66c9c92 Merge remote/origin after add API2.0 Response mapper. |\ | * 91bbd91 Merge branch 'master' of 54.247.94.35:QuizKingAndroid | |\ | * | 06cb0dc Finished Mahmoud Code. | * | 7f71dd8 Finished Push Notification | * | caefa1f Finished Push Notification | * | d28f77a finished share on facebook worked on push notification | * | c53f5d4 1- share by facebook (still have issue) 2- share by twitter * | | bd8cf99 Added BaseHttpRespose generic class to map API2.0 respose with(Head,Data,More). | |/ |/| * | bc7443a Finished UI Customization. * | 56211e4 Change activites code structure with Base Fragment activity (BaseNavDrawer) has two sub classes(NavDrawerProfileHeader,NavDrawerSubHeader), All screens on the App will inherit from one of theme. Add FragmentFactory to manage fragment instantiation, Replace Navigation menu adaptor by static menu layout. * | d7b7eff modifiy UpdateImageTask and some mofofocation before change NavDrawer and Menu * | e9799dc - Finished change user password. - Worked on improve code Architecture. - Worked on Scoreboard refactor with new architecture design. - Delete duplications. - Create FragmentFactory used to instantiate WOKFragments. |/ * f924f6b After merge all MN and KL changes * b9b1a02 merge new added files! * 4ef3a1b merge with MN changes! * 25737a2 Add QuizKing, FB and slider libs under QuizKing app_lib directory. * 62c3c33 Before Share code with MN * ef1e1b0 Add ViewPager indicator lib reference, create question ONCE * caf3e13 after add FB lib and remove FB lib reference, after change App name to QuizKing * 7c42974 Finished ScoreBoard design and usage with filters. * 5e00d3d Before change HttpURLConnection on JSONParser class. * b4ad078 Add create question with fragment and back, option. * 5764bfe Add MainLoginContainer that contain mainLogin screen, Signin Screen and Signup screen , to slide all with help content. * 97e741f Fix FB login button issue, add cancel to login signup * e7dc366 Before change FB login api. * 84e1c01 Main Login with viewpager and indicator fixed. * 188f045 Indicator Code before refactoring with lib. * 359c483 First commit with indicator code.