Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Menu 2.0 #1058

Merged
merged 42 commits into from Jun 6, 2019
Merged

Menu 2.0 #1058

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
57860c2
MVP for iPhone
iccub Apr 2, 2019
d2a4044
Migrate urlbar items to stackview
iccub Apr 3, 2019
0e2a935
Better naming and file separation for toolbar objects
iccub Apr 3, 2019
799f2c7
WIP: menu actions
iccub Apr 6, 2019
1f25420
Long press actions: dismissal and refactor.
iccub Apr 8, 2019
2cb5750
Remove HomeViewController
iccub Apr 8, 2019
191f371
BookmarksVC cleanup: remove unused code
iccub Apr 8, 2019
7926cfe
folder hirerarchy alpha version
iccub Apr 11, 2019
17afd7d
Make separator line work.
iccub Apr 11, 2019
bbdaa80
Add bookmark mvp, can add at root level.
iccub Apr 14, 2019
7d19867
Merge branch 'development' of github.com:brave/brave-ios into feature…
iccub Apr 14, 2019
ea4f0d8
Adding bookmark works.
iccub Apr 15, 2019
c3a737a
Add folders mvp
iccub Apr 15, 2019
ee76b6a
xcode 10.2
iccub Apr 15, 2019
f06a617
Correct buttons when adding a folder.
iccub Apr 16, 2019
02dab4c
Dismiss view when bookmark is selected.
iccub Apr 16, 2019
c0d29cd
Support editing modes in AddEditBookmarkVC
iccub Apr 16, 2019
736fc5e
Edit without saving location mvp.
iccub Apr 16, 2019
5138870
Edit bookmark location mvp
iccub Apr 17, 2019
ada5f14
Fetch favicon to bookmark details
iccub Apr 17, 2019
134d4a9
whitespace
iccub Apr 17, 2019
d68cad8
Add localized strings
iccub Apr 17, 2019
c022eb5
Edit improvements, title for add/edit screen
iccub Apr 17, 2019
7e30962
Remove unused BookmarkEditViewController
iccub Apr 17, 2019
f781004
Update image assets.
iccub Apr 17, 2019
1d5d612
Make folder detail height equal to folder hierarchy cells height.
iccub Apr 17, 2019
e6c7a1c
Harden against sync changes.
iccub Apr 17, 2019
93c9a24
Make updated url bar work with safe area insets
iccub Apr 17, 2019
880de9e
Show share menu popover at correct location.
iccub Apr 17, 2019
40f11b9
Design feedback from James.
iccub Apr 18, 2019
99b171f
Bookmark/folder detail views refactor.
iccub Apr 18, 2019
0bf5ddc
Header view refactor.
iccub Apr 18, 2019
c57f709
AddEditBookmarkTableViewController refactor.
iccub Apr 19, 2019
1d9e0c3
MenuViewController refactor.
iccub Apr 19, 2019
de90bd1
final touches
iccub Apr 19, 2019
32e1e30
Fix unit tests.
iccub Apr 19, 2019
bc45a12
review
iccub Apr 23, 2019
f7fd274
Make folderCellTag private
iccub Apr 23, 2019
839602c
Merge branch 'development' of github.com:brave/brave-ios into feature…
iccub Apr 23, 2019
8ad53f3
Swift 4.2 conformance
iccub Apr 23, 2019
21d08ed
Fix title helper function
iccub Apr 23, 2019
76ab847
Set syncParentUUID when updating location.
iccub Apr 23, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Add localized strings

  • Loading branch information
iccub committed Apr 17, 2019
commit d68cad86d17bfe8ff989ad43447282fff4cda791
@@ -26,6 +26,8 @@ public extension Strings {
public static let CopyLinkActionTitle = NSLocalizedString("CopyLinkActionTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Copy Link", comment: "Context menu item for copying a link URL to the clipboard")
public static let OpenNewPrivateTabButtonTitle = NSLocalizedString("OpenNewPrivateTabButtonTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Open in New Private Tab", comment: "Context menu option for opening a link in a new private tab")
public static let DeleteLoginButtonTitle = NSLocalizedString("DeleteLoginButtonTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Delete", comment: "Label for the button used to delete the current login.")
static let SaveButtonTitle = NSLocalizedString("SaveButtonTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Save", comment: "Label for the button used to save data")

}

// MARK:- UIAlertControllerExtensions.swift
@@ -485,4 +487,14 @@ public extension Strings {
public static let DDG_callout_no = NSLocalizedString("DDGCalloutNo", tableName: "BraveShared", bundle: Bundle.braveShared, value: "No", comment: "DuckDuckGo callout no action.")
public static let DDG_callout_enable = NSLocalizedString("DDGCalloutEnable", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Yes", comment: "DuckDuckGo callout enable action.")
public static let DDG_promotion = NSLocalizedString("LearnAboutPrivateSearchrwithDuckDuckGo", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Learn about private search \nwith DuckDuckGo", comment: "DuckDuckGo promotion label.")
static let NewFolderDefaultName = NSLocalizedString("NewFolderDefaultName", tableName: "BraveShared", bundle: Bundle.braveShared, value: "New Folder", comment: "Default name for creating a new folder.")
static let NewBookmarkDefaultName = NSLocalizedString("NewBookmarkDefaultName", tableName: "BraveShared", bundle: Bundle.braveShared, value: "New Bookmark", comment: "Default name for creating a new bookmark.")
static let BookmarkTitlePlaceholderText = NSLocalizedString("BookmarkTitlePlaceholderText", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Name", comment: "Placeholder text for adding or editing a bookmark")
static let BookmarkUrlPlaceholderText = NSLocalizedString("BookmarkUrlPlaceholderText", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Address", comment: "Placeholder text for adding or editing a bookmark")
static let FavoritesLocationFooterText = NSLocalizedString("FavoritesLocationFooterText", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Favorites are located on your home screen. These bookmarks are not synchronized with other devices.", comment: "Footer text when user selects to save to favorites when editing a bookmark")
static let BookmarkRootLevelCellTitle = NSLocalizedString("BookmarkRootLevelCellTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Bookmarks", comment: "Title for root level bookmarks cell")
static let FavoritesRootLevelCellTitle = NSLocalizedString("FavoritesRootLevelCellTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Favorites", comment: "Title for favorites cell")
static let AddFolderActionCellTitle = NSLocalizedString("AddFolderActionCellTitle", tableName: "BraveShared", bundle: Bundle.braveShared, value: "New folder", comment: "Cell title for add folder action")
static let EditBookmarkTableLocationHeader = NSLocalizedString("EditBookmarkTableLocationHeader", tableName: "BraveShared", bundle: Bundle.braveShared, value: "Location", comment: "Header title for bookmark save location")

}
@@ -5,6 +5,7 @@
import UIKit
import CoreData
import Data
import Shared

protocol AddEditBookmarkDelegate: class {
func didSelectFolder(/*_ folder: Bookmark*/)
@@ -86,7 +87,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
let button = UIBarButtonItem()
button.target = self
button.action = #selector(save)
button.title = "Save"
button.title = Strings.SaveButtonTitle

return button
}()
@@ -271,8 +272,15 @@ class AddEditBookmarkTableViewController: UITableViewController {
}
}

override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
switch location {
case .favorites: return Strings.FavoritesLocationFooterText
default: return nil
}
}

override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
return "Location"
return Strings.EditBookmarkTableLocationHeader
}

override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -298,14 +306,14 @@ class AddEditBookmarkTableViewController: UITableViewController {
}

func showNewFolderVC() {
let vc = AddEditBookmarkTableViewController(mode: .newFolder(title: "New folder"))
let vc = AddEditBookmarkTableViewController(mode: .newFolder(title: Strings.NewFolderDefaultName))
vc.delegate = self
navigationController?.pushViewController(vc, animated: true)
}

var rootLevelFolderCell: IndentedImageTableViewCell {
let cell = IndentedImageTableViewCell().then {
$0.folderName.text = "Bookmarks"
$0.folderName.text = Strings.BookmarkRootLevelCellTitle
$0.tag = Location.rootLevelTag
if case .rootLevel = location, presentationMode == .folderHierarchy {
$0.accessoryType = .checkmark
@@ -317,7 +325,7 @@ class AddEditBookmarkTableViewController: UITableViewController {

var favoritesCell: IndentedImageTableViewCell {
let cell = IndentedImageTableViewCell(image: #imageLiteral(resourceName: "menu-Bookmark"))
cell.folderName.text = "Favorites"
cell.folderName.text = Strings.FavoritesRootLevelCellTitle
cell.tag = Location.favoritesTag
if case .favorites = location, presentationMode == .folderHierarchy {
cell.accessoryType = .checkmark
@@ -350,7 +358,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
case .newBookmark(_), .editBookmark(_):
if row == 0 {
let cell = IndentedImageTableViewCell(image: #imageLiteral(resourceName: "add_tab"))
cell.folderName.text = "New Folder"
cell.folderName.text = Strings.AddFolderActionCellTitle
cell.accessoryType = .disclosureIndicator
cell.tag = Location.newFolderTag

@@ -4,6 +4,7 @@
import UIKit
import SnapKit
import Shared

protocol BookmarkDetailsViewDelegate: class {
func correctValues(validationPassed: Bool)
@@ -91,8 +92,8 @@ class BookmarkDetailsView: UIView, BookmarkFormFieldsProtocol {
faviconImageView.setIcon(nil, forURL: favUrl)
}

titleTextField.text = title ?? "New bookmark"
urlTextField.text = url ?? "New folder"
titleTextField.text = title ?? Strings.NewBookmarkDefaultName
urlTextField.text = url ?? Strings.NewFolderDefaultName

mainStackView.snp.makeConstraints {
$0.edges.equalTo(self)
@@ -3,6 +3,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
import UIKit
import Shared

class FolderDetailsViewTableViewCell: UIView, BookmarkFormFieldsProtocol {

@@ -41,7 +42,7 @@ class FolderDetailsViewTableViewCell: UIView, BookmarkFormFieldsProtocol {
mainStackView.addArrangedSubview(titleTextField)
mainStackView.addArrangedSubview(spacerLine)

titleTextField.text = title ?? "New folder"
titleTextField.text = title ?? Strings.NewFolderDefaultName

mainStackView.snp.makeConstraints {
$0.edges.equalTo(self)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.