[ios] Remove 'no location' status label.

This commit is contained in:
Ilya Grechuhin 2015-06-06 20:32:03 +03:00 committed by Alex Zolotarev
parent 37efd0b3c8
commit 7fc82f5a50
49 changed files with 0 additions and 243 deletions

View file

@ -699,6 +699,4 @@
<string name="download_failed">Stahování selhalo</string>
<!-- get the map -->
<string name="get_the_map">Získejte mapu</string>
<!-- location mode off -->
<string name="location_mode_off">Režim zjišťování pozice: vypnut</string>
</resources>

View file

@ -692,6 +692,4 @@
<string name="download_failed">download mislykkedes</string>
<!-- get the map -->
<string name="get_the_map">Få kort</string>
<!-- location mode off -->
<string name="location_mode_off">Positionsbestemmelses-tilstand: Fra</string>
</resources>

View file

@ -687,6 +687,4 @@
<string name="download_failed">herunterladen fehlgeschlagen</string>
<!-- get the map -->
<string name="get_the_map">Karte abrufen</string>
<!-- location mode off -->
<string name="location_mode_off">Standortpositionierungsmodus: Aus</string>
</resources>

View file

@ -683,6 +683,4 @@
<string name="download_failed">la descarga ha fallado</string>
<!-- get the map -->
<string name="get_the_map">Obtén el mapa</string>
<!-- location mode off -->
<string name="location_mode_off">Modo posicionamiento de ubicación: desactivado</string>
</resources>

View file

@ -703,6 +703,4 @@
<string name="download_failed">échec lors du téléchargement</string>
<!-- get the map -->
<string name="get_the_map">Téléchargez des cartes</string>
<!-- location mode off -->
<string name="location_mode_off">Mode positionnement de l\&#39;emplacement: désactivé</string>
</resources>

View file

@ -693,6 +693,4 @@
<string name="download_failed">letöltése sikertelen</string>
<!-- get the map -->
<string name="get_the_map">Térkép megszerzése</string>
<!-- location mode off -->
<string name="location_mode_off">Helypozicionáló mód: ki</string>
</resources>

View file

@ -689,6 +689,4 @@
<string name="download_failed">Il trasferimento di non è riuscito</string>
<!-- get the map -->
<string name="get_the_map">Scarica la mappa</string>
<!-- location mode off -->
<string name="location_mode_off">Modalità posizionamento luogo: off</string>
</resources>

View file

@ -689,6 +689,4 @@
<string name="download_failed">のダウンロードが失敗しました</string>
<!-- get the map -->
<string name="get_the_map">地図を入手</string>
<!-- location mode off -->
<string name="location_mode_off">位置測位モード:オフ</string>
</resources>

View file

@ -680,6 +680,4 @@
<string name="download_failed">다운로드가 실패했습니다</string>
<!-- get the map -->
<string name="get_the_map">지도 가져오기</string>
<!-- location mode off -->
<string name="location_mode_off">위치 지정 모드: 끄기</string>
</resources>

View file

@ -682,6 +682,4 @@
<string name="download_failed">download is afgebroken</string>
<!-- get the map -->
<string name="get_the_map">Krijg kaart</string>
<!-- location mode off -->
<string name="location_mode_off">Modus locatie positioneren: uit</string>
</resources>

View file

@ -693,6 +693,4 @@
<string name="download_failed">pobieranie nie powiodło się</string>
<!-- get the map -->
<string name="get_the_map">Pobierz mapę</string>
<!-- location mode off -->
<string name="location_mode_off">Tryb umiejscawiania lokalizacji: wył.</string>
</resources>

View file

@ -689,6 +689,4 @@
<string name="download_failed">descarga falhou</string>
<!-- get the map -->
<string name="get_the_map">Obter mapa</string>
<!-- location mode off -->
<string name="location_mode_off">Localização do modo de posicionamento: desligado</string>
</resources>

View file

@ -703,6 +703,4 @@
<string name="download_failed">Не удалось загрузить</string>
<!-- get the map -->
<string name="get_the_map">Загрузить карту</string>
<!-- location mode off -->
<string name="location_mode_off">Режим определения местоположения: выкл</string>
</resources>

View file

@ -695,6 +695,4 @@
<string name="download_failed">Sťahovanie zlyhalo</string>
<!-- get the map -->
<string name="get_the_map">Stiahnuť mapu</string>
<!-- location mode off -->
<string name="location_mode_off">Režim zacieľovania polohy: vypnutý</string>
</resources>

View file

@ -692,6 +692,4 @@
<string name="download_failed">nedladdning misslyckades</string>
<!-- get the map -->
<string name="get_the_map">Hämta karta</string>
<!-- location mode off -->
<string name="location_mode_off">Platspositioneringsläge: av</string>
</resources>

View file

@ -694,6 +694,4 @@
<string name="download_failed">การดาวน์โหลด ล้มเหลว</string>
<!-- get the map -->
<string name="get_the_map">รับแผนที่</string>
<!-- location mode off -->
<string name="location_mode_off">โหมดการวางตำแหน่งที่ตั้ง: ปิด</string>
</resources>

View file

@ -696,6 +696,4 @@
<string name="download_failed">indirme işlemi başarısız oldu</string>
<!-- get the map -->
<string name="get_the_map">Harita alın</string>
<!-- location mode off -->
<string name="location_mode_off">Konum ayarlama modu: kapalı</string>
</resources>

View file

@ -697,6 +697,4 @@
<string name="download_failed">Не вдалося завантажити</string>
<!-- get the map -->
<string name="get_the_map">Отримати карту</string>
<!-- location mode off -->
<string name="location_mode_off">Режим \&quot;Місце розташування\&quot;: викл</string>
</resources>

View file

@ -678,6 +678,4 @@
<string name="download_failed">下載失敗</string>
<!-- get the map -->
<string name="get_the_map">獲取地圖</string>
<!-- location mode off -->
<string name="location_mode_off">位置定位模式:關</string>
</resources>

View file

@ -696,6 +696,4 @@
<string name="download_failed">下载失败</string>
<!-- get the map -->
<string name="get_the_map">获取地图</string>
<!-- location mode off -->
<string name="location_mode_off">位置定位模式:关</string>
</resources>

View file

@ -705,6 +705,4 @@
<string name="download_failed">download has failed</string>
<!-- get the map -->
<string name="get_the_map">Get the map</string>
<!-- location mode off -->
<string name="location_mode_off">Location positioning mode: off</string>
</resources>

View file

@ -8,7 +8,6 @@
#import "MWMLocationButton.h"
#import "MWMLocationButtonView.h"
#import "MWMLocationButtonStatusLabel.h"
#include "Framework.h"
@ -17,7 +16,6 @@ static NSString * const kMWMLocationButtonViewNibName = @"MWMLocationButton";
@interface MWMLocationButton()
@property (nonatomic) IBOutlet MWMLocationButtonView * button;
@property (nonatomic) IBOutlet MWMLocationButtonStatusLabel * statusLabel;
@end
@ -30,7 +28,6 @@ static NSString * const kMWMLocationButtonViewNibName = @"MWMLocationButton";
{
[[NSBundle mainBundle] loadNibNamed:kMWMLocationButtonViewNibName owner:self options:nil];
[view addSubview:self.button];
[view addSubview:self.statusLabel];
[self configLocationListener];
}
return self;
@ -48,8 +45,6 @@ static NSString * const kMWMLocationButtonViewNibName = @"MWMLocationButton";
- (void)onLocationStateModeChanged:(location::State::Mode)state
{
self.button.locationState = state;
if (state == location::State::Mode::UnknownPosition)
[self.statusLabel show];
}
- (IBAction)buttonPressed:(id)sender

View file

@ -8,7 +8,6 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMLocationButton">
<connections>
<outlet property="button" destination="5qS-Qi-k1g" id="YgC-Eq-sz4"/>
<outlet property="statusLabel" destination="MnZ-WC-gT0" id="XF3-8D-jWV"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@ -27,21 +26,6 @@
</connections>
<point key="canvasLocation" x="267.5" y="254"/>
</button>
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GPS отключен" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" adjustsFontSizeToFit="NO" id="MnZ-WC-gT0" customClass="MWMLocationButtonStatusLabel">
<rect key="frame" x="0.0" y="0.0" width="105" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="location_mode_off"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="474.5" y="271.5"/>
</label>
</objects>
<resources>
<image name="btn_white_target_off_1" width="56" height="56"/>

View file

@ -1,18 +0,0 @@
//
// MWMLocationButtonStatusLabel.h
// Maps
//
// Created by Ilya Grechuhin on 29.05.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface MWMLocationButtonStatusLabel : UILabel
- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
- (instancetype)init __attribute__((unavailable("init is not available")));
- (void)show;
@end

View file

@ -1,65 +0,0 @@
//
// MWMLocationButtonStatusLabel.m
// Maps
//
// Created by Ilya Grechuhin on 29.05.15.
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
#import "MWMLocationButtonStatusLabel.h"
#import "MWMMapViewControlsCommon.h"
#import "UIKitCategories.h"
@implementation MWMLocationButtonStatusLabel
- (instancetype)initWithCoder:(NSCoder *)aDecoder
{
self = [super initWithCoder:aDecoder];
if (!self)
return nil;
self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
return self;
}
- (void)layoutSubviews
{
static CGFloat const maxLabelWidthPercentOfScreen = 0.52;
static CGFloat const hSpacing = 4.0;
static CGFloat const vSpacing = 1.0;
[super layoutSubviews];
self.width = maxLabelWidthPercentOfScreen * self.superview.width;
[self sizeToFit];
self.width = self.width + 2.0 * hSpacing;
self.height = self.height + 2.0 * vSpacing;
self.midX = self.superview.midX;
self.maxY = self.superview.height - 2.0 * kViewControlsOffsetToBounds;
}
- (void)show
{
self.hidden = NO;
self.alpha = 0.0;
[UIView animateWithDuration:framesDuration(1) animations:^
{
self.alpha = 1.0;
}
completion:^(BOOL finished)
{
[self performSelector:@selector(hide) withObject:self afterDelay:framesDuration(30)];
}];
}
- (void)hide
{
[UIView animateWithDuration:framesDuration(1) animations:^
{
self.alpha = 0.0;
}
completion:^(BOOL finished)
{
self.hidden = YES;
}];
}
@end

View file

@ -48,7 +48,6 @@
34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */; };
34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */; };
34DF4D111AE77B9F0012702D /* MWMWKInterfaceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34DF4D101AE77B9F0012702D /* MWMWKInterfaceController.mm */; };
34F209691B18BCEE005744D6 /* MWMLocationButtonStatusLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F209681B18BCEE005744D6 /* MWMLocationButtonStatusLabel.m */; };
45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */ = {isa = PBXBuildFile; fileRef = 45159BF81B0CA2D5009BFA85 /* resources-6plus */; };
454040621AD2D75E007A9B12 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26C7210F61FD600ECCA39 /* OpenGLES.framework */; };
454040631AD2D83A007A9B12 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C98655186C734000AF7E9E /* AVFoundation.framework */; };
@ -367,8 +366,6 @@
34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMZoomButtonsView.xib; sourceTree = "<group>"; };
34DF4D0F1AE77B9F0012702D /* MWMWKInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWKInterfaceController.h; sourceTree = "<group>"; };
34DF4D101AE77B9F0012702D /* MWMWKInterfaceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWKInterfaceController.mm; sourceTree = "<group>"; };
34F209671B18BCEE005744D6 /* MWMLocationButtonStatusLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationButtonStatusLabel.h; sourceTree = "<group>"; };
34F209681B18BCEE005744D6 /* MWMLocationButtonStatusLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMLocationButtonStatusLabel.m; sourceTree = "<group>"; };
3D443C9C19E421EE0025C2FC /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
45159BF81B0CA2D5009BFA85 /* resources-6plus */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus"; path = "../../data/resources-6plus"; sourceTree = "<group>"; };
454040681AD2D8D2007A9B12 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@ -1002,8 +999,6 @@
34BC720F1B0DECAE0012A34B /* MWMLocationButton.xib */,
34BC720D1B0DECAE0012A34B /* MWMLocationButtonView.h */,
34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */,
34F209671B18BCEE005744D6 /* MWMLocationButtonStatusLabel.h */,
34F209681B18BCEE005744D6 /* MWMLocationButtonStatusLabel.m */,
);
path = LocationButton;
sourceTree = "<group>";
@ -1891,7 +1886,6 @@
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */,
F61579341AC2CE9A0032D8E9 /* MWMRateAlert.mm in Sources */,
34F209691B18BCEE005744D6 /* MWMLocationButtonStatusLabel.m in Sources */,
A3CC2CD41A1C723900B832E1 /* LocationPredictor.mm in Sources */,
EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */,
6C93FAEC1AD8063900A2C4AE /* MWMWatchNotification.mm in Sources */,

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "احصل على الخريطة";
/* location mode off */
"location_mode_off" = "Location positioning mode: off";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Získejte mapu";
/* location mode off */
"location_mode_off" = "Režim zjišťování pozice: vypnut";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Få kort";
/* location mode off */
"location_mode_off" = "Positionsbestemmelses-tilstand: Fra";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Karte abrufen";
/* location mode off */
"location_mode_off" = "Standortpositionierungsmodus: Aus";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Get the map";
/* location mode off */
"location_mode_off" = "Location positioning mode: off";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Obtén el mapa";
/* location mode off */
"location_mode_off" = "Modo posicionamiento de ubicación: desactivado";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Téléchargez des cartes";
/* location mode off */
"location_mode_off" = "Mode positionnement de l'emplacement: désactivé";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Térkép megszerzése";
/* location mode off */
"location_mode_off" = "Helypozicionáló mód: ki";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Scarica la mappa";
/* location mode off */
"location_mode_off" = "Modalità posizionamento luogo: off";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "地図を入手";
/* location mode off */
"location_mode_off" = "位置測位モード:オフ";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "지도 가져오기";
/* location mode off */
"location_mode_off" = "위치 지정 모드: 끄기";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Krijg kaart";
/* location mode off */
"location_mode_off" = "Modus locatie positioneren: uit";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Pobierz mapę";
/* location mode off */
"location_mode_off" = "Tryb umiejscawiania lokalizacji: wył.";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Obter mapa";
/* location mode off */
"location_mode_off" = "Localização do modo de posicionamento: desligado";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Загрузить карту";
/* location mode off */
"location_mode_off" = "Режим определения местоположения: выкл";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Stiahnuť mapu";
/* location mode off */
"location_mode_off" = "Režim zacieľovania polohy: vypnutý";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Hämta karta";
/* location mode off */
"location_mode_off" = "Platspositioneringsläge: av";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "รับแผนที่";
/* location mode off */
"location_mode_off" = "โหมดการวางตำแหน่งที่ตั้ง: ปิด";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Harita alın";
/* location mode off */
"location_mode_off" = "Konum ayarlama modu: kapalı";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "Отримати карту";
/* location mode off */
"location_mode_off" = "Режим \"Місце розташування\": викл";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "获取地图";
/* location mode off */
"location_mode_off" = "位置定位模式:关";

View file

@ -1074,6 +1074,3 @@
/* get the map */
"get_the_map" = "獲取地圖";
/* location mode off */
"location_mode_off" = "位置定位模式:關";

View file

@ -10187,28 +10187,3 @@
da = Få kort
tr = Harita alın
sv = Hämta karta
[location_mode_off]
tags = android, ios
comment = location mode off
en = Location positioning mode: off
cs = Režim zjišťování pozice: vypnut
sk = Režim zacieľovania polohy: vypnutý
de = Standortpositionierungsmodus: Aus
es = Modo posicionamiento de ubicación: desactivado
fr = Mode positionnement de l'emplacement: désactivé
it = Modalità posizionamento luogo: off
ja = 位置測位モード:オフ
ko = 위치 지정 모드: 끄기
nl = Modus locatie positioneren: uit
ru = Режим определения местоположения: выкл
uk = Режим "Місце розташування": викл
zh-Hant = 位置定位模式:關
pl = Tryb umiejscawiania lokalizacji: wył.
pt = Localização do modo de posicionamento: desligado
hu = Helypozicionáló mód: ki
th = โหมดการวางตำแหน่งที่ตั้ง: ปิด
zh-Hans = 位置定位模式:关
sv= Platspositioneringsläge: av
tr = Konum ayarlama modu: kapalı
da = Positionsbestemmelses-tilstand: Fra