Implemented usage of instancetype

Author: 須藤将史

StudyplusSDK/SPLStopwatch.m

@@ -35,7 +35,7 @@ @interface SPLStopwatch()
 
 @implementation SPLStopwatch
 
--(id)init
+-(instancetype)init
 {
     if (self = [super init]) {
         self.elapsedSeconds = 0;

StudyplusSDK/SPLStudyplus.h

@@ -108,8 +108,8 @@ NS_ASSUME_NONNULL_BEGIN
  @return SPLStudyplus object. <br>
  SPLStudyplusオブジェクト。
  */
-+ (SPLStudyplus*)studyplusWithConsumerKey:(NSString*)consumerKey
-                        andConsumerSecret:(NSString*)consumerSecret;
++ (instancetype)studyplusWithConsumerKey:(NSString*)consumerKey
+                       andConsumerSecret:(NSString*)consumerSecret;
 
 /**
  Opens the auth screen by invoking the Studyplus application.

StudyplusSDK/SPLStudyplus.m

@@ -42,15 +42,15 @@ @interface SPLStudyplus()
 
 @implementation SPLStudyplus
 
-+ (SPLStudyplus*)studyplusWithConsumerKey:(NSString*)consumerKey
-                        andConsumerSecret:(NSString*)consumerSecret
++ (instancetype)studyplusWithConsumerKey:(NSString*)consumerKey
+                       andConsumerSecret:(NSString*)consumerSecret
 {
     return [[SPLStudyplus alloc] __initWithConsumerKey:consumerKey
                                      andConsumerSecret:consumerSecret];
 }
 
-- (id)__initWithConsumerKey:(NSString*)consumerKey
-          andConsumerSecret:(NSString*)consumerSecret
+- (instancetype)__initWithConsumerKey:(NSString*)consumerKey
+                    andConsumerSecret:(NSString*)consumerSecret
 {
 
     if (self = [super init]) {

StudyplusSDK/SPLStudyplusAPIRequest.h

@@ -26,8 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SPLStudyplusAPIRequest : NSObject
 
-+ (SPLStudyplusAPIRequest*)newRequestWithAccessToken:(NSString*)accessToken
-                                             options:(NSDictionary*)options;
++ (instancetype)newRequestWithAccessToken:(NSString*)accessToken
+                                  options:(NSDictionary*)options;
 
 - (void)postRequestWithPath:(NSString *)path
            requestParameter:(NSDictionary *)requestParameter

StudyplusSDK/SPLStudyplusAPIRequest.m

@@ -35,23 +35,23 @@ @interface SPLStudyplusAPIRequest()
 
 @implementation SPLStudyplusAPIRequest
 
-- (id)init
+- (instancetype)init
 {
     if (self = [super init]) {
         _accessToken = nil;
     }
     return self;
 }
 
-+ (SPLStudyplusAPIRequest*)newRequestWithAccessToken:(NSString*)accessToken
-                                             options:(NSDictionary*)options
++ (instancetype)newRequestWithAccessToken:(NSString*)accessToken
+                                  options:(NSDictionary*)options
 {
     return [[SPLStudyplusAPIRequest alloc] initWithAccessToken:accessToken
                                                        options:options];
 }
 
-- (id)initWithAccessToken:(NSString*)accessToken
-                  options:(NSDictionary*)options
+- (instancetype)initWithAccessToken:(NSString*)accessToken
+                            options:(NSDictionary*)options
 {
     if (self = [super init]) {
         _accessToken = accessToken;

StudyplusSDK/SPLStudyplusRecord.h

@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @result StudyplusRecord object.
  */
-+ (SPLStudyplusRecord*)recordWithDuration:(NSTimeInterval)duration;
++ (instancetype)recordWithDuration:(NSTimeInterval)duration;
 
 /**
  Creates and returns StudyplusRecord object that has number of seconds and other attributes.
@@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
  
  @result StudyplusRecord object.
  */
-+ (SPLStudyplusRecord*)recordWithDuration:(NSTimeInterval)duration options:(NSDictionary* _Nullable)options;
++ (instancetype)recordWithDuration:(NSTimeInterval)duration options:(NSDictionary* _Nullable)options;
 
 /**
  @result Returns the parameters of the study record for posting API

StudyplusSDK/SPLStudyplusRecord.m

@@ -33,12 +33,12 @@ - (id)getKey:(NSString*)key orElse:(id)elseValue;
 
 @implementation SPLStudyplusRecord
 
-+ (SPLStudyplusRecord*)recordWithDuration:(NSTimeInterval)duration
++ (instancetype)recordWithDuration:(NSTimeInterval)duration
 {
     return [self recordWithDuration:duration options:@{}];
 }
 
-+ (SPLStudyplusRecord*)recordWithDuration: (NSTimeInterval)duration options:(NSDictionary*)options
++ (instancetype)recordWithDuration: (NSTimeInterval)duration options:(NSDictionary*)options
 {
     return [[[self class] alloc] initWithDuration:duration options:options];
 }
@@ -52,7 +52,7 @@ - (id)getKey:(NSString *)key from:(NSDictionary *)dict orElse:(id)elseValue
     return value;
 }
 
-- (id)initWithDuration:(NSTimeInterval)duration options:(NSDictionary*)options
+- (instancetype)initWithDuration:(NSTimeInterval)duration options:(NSDictionary*)options
 {
     if (self = [super init]) {
         _duration = duration;

StudyplusSDK/SPLStudyplusRecordAmount.h

@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param amount 学習量。
  @result SPLStudyplusRecordAmount* 生成したAmountオブジェクトです。
  */
-+ (SPLStudyplusRecordAmount*)amount:(NSUInteger)amount;
++ (instancetype)amount:(NSUInteger)amount;
 
 /**
  Creates and returns the Amount object with a range of learning amount.<br>
@@ -47,14 +47,14 @@ NS_ASSUME_NONNULL_BEGIN
  @param to 学習量の終点。
  @result SPLStudyplusRecordAmount* 生成したAmountオブジェクトです。
  */
-+ (SPLStudyplusRecordAmount*)amountAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to;
++ (instancetype)amountAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to;
 
 /**
  Creates and returns the Amount object that has no learning amount.<br>
  学習量を持たないAmountオブジェクトを生成して返します。
  @result SPLStudyplusRecordAmount* 生成したAmountオブジェクトです。
  */
-+ (SPLStudyplusRecordAmount*)amountAsNone;
++ (instancetype)amountAsNone;
 
 /**
  @result Returns the parameters of the study record for posting API

StudyplusSDK/SPLStudyplusRecordAmount.m

@@ -28,12 +28,12 @@ @interface SPLStudyplusRecordAmount()
 
 @implementation SPLStudyplusRecordAmount
 
-+ (SPLStudyplusRecordAmount*)amount:(NSUInteger)amount
++ (instancetype)amount:(NSUInteger)amount
 {
     return [[[self class] alloc] initAsAmount:amount];
 }
 
-- (id)initAsAmount:(NSUInteger)amount
+- (instancetype)initAsAmount:(NSUInteger)amount
 {
     if (self = [super init]) {
         _requestParameter = @{
@@ -43,12 +43,12 @@ - (id)initAsAmount:(NSUInteger)amount
     return self;
 }
 
-+ (SPLStudyplusRecordAmount*)amountAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to
++ (instancetype)amountAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to
 {
     return [[[self class] alloc] initAsRangeWithFrom:from to:to];
 }
 
-- (id)initAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to
+- (instancetype)initAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to
 {
     if (self = [super init]) {
         _requestParameter = @{
@@ -59,12 +59,12 @@ - (id)initAsRangeWithFrom:(NSUInteger)from to:(NSUInteger)to
     return self;
 }
 
-+ (SPLStudyplusRecordAmount*)amountAsNone
++ (instancetype)amountAsNone
 {
     return [[[self class] alloc] initAsNone];
 }
 
-- (id)initAsNone
+- (instancetype)initAsNone
 {
     if (self = [super init]) {
         _requestParameter = @{};