Skip to content

Commit

Permalink
Merge pull request #14 from aboveyunhai/rename
Browse files Browse the repository at this point in the history
Rename App
  • Loading branch information
aboveyunhai authored Dec 21, 2021
2 parents 0f2fe72 + 60c6611 commit f38ce6c
Show file tree
Hide file tree
Showing 28 changed files with 1,036 additions and 151 deletions.
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/pedoer/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class MainActivity extends ReactActivity {
*/
@Override
protected String getMainComponentName() {
return "Pedoer";
return "FitEtc";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Pedoer</string>
<string name="app_name">FitEtc</string>
</resources>
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = 'Pedoer'
rootProject.name = 'FitEtc'
include ':react-native-google-fit'
project(':react-native-google-fit').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-fit/android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
Expand Down
4 changes: 2 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "Pedoer",
"displayName": "Pedoer"
"name": "FitEtc",
"displayName": "FitEtc"
}
File renamed without changes.
File renamed without changes.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "Pedoer-tvOS.app"
BlueprintName = "Pedoer-tvOS"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc-tvOS.app"
BlueprintName = "FitEtc-tvOS"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -43,9 +43,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
BuildableName = "Pedoer-tvOSTests.xctest"
BlueprintName = "Pedoer-tvOSTests"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc-tvOSTests.xctest"
BlueprintName = "FitEtc-tvOSTests"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -61,19 +61,19 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
BuildableName = "Pedoer-tvOSTests.xctest"
BlueprintName = "Pedoer-tvOSTests"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc-tvOSTests.xctest"
BlueprintName = "FitEtc-tvOSTests"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "Pedoer-tvOS.app"
BlueprintName = "Pedoer-tvOS"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc-tvOS.app"
BlueprintName = "FitEtc-tvOS"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -94,9 +94,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "Pedoer-tvOS.app"
BlueprintName = "Pedoer-tvOS"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc-tvOS.app"
BlueprintName = "FitEtc-tvOS"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
Expand All @@ -113,9 +113,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "Pedoer-tvOS.app"
BlueprintName = "Pedoer-tvOS"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc-tvOS.app"
BlueprintName = "FitEtc-tvOS"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Pedoer.app"
BlueprintName = "Pedoer"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc.app"
BlueprintName = "FitEtc"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -43,9 +43,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "PedoerTests.xctest"
BlueprintName = "PedoerTests"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtcTests.xctest"
BlueprintName = "FitEtcTests"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -61,19 +61,19 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "PedoerTests.xctest"
BlueprintName = "PedoerTests"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtcTests.xctest"
BlueprintName = "FitEtcTests"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Pedoer.app"
BlueprintName = "Pedoer"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc.app"
BlueprintName = "FitEtc"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -94,9 +94,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Pedoer.app"
BlueprintName = "Pedoer"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc.app"
BlueprintName = "FitEtc"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
Expand All @@ -113,9 +113,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Pedoer.app"
BlueprintName = "Pedoer"
ReferencedContainer = "container:Pedoer.xcodeproj">
BuildableName = "FitEtc.app"
BlueprintName = "FitEtc"
ReferencedContainer = "container:FitEtc.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion ios/Pedoer/AppDelegate.m → ios/FitEtc/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
{
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
moduleName:@"Pedoer"
moduleName:@"FitEtc"
initialProperties:nil];

rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pedoer" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FitEtc" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
2 changes: 1 addition & 1 deletion ios/Pedoer/Info.plist → ios/FitEtc/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Pedoer</string>
<string>FitEtc</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#define TIMEOUT_SECONDS 600
#define TEXT_TO_LOOK_FOR @"Welcome to React"

@interface PedoerTests : XCTestCase
@interface FitEtcTests : XCTestCase

@end

@implementation PedoerTests
@implementation FitEtcTests

- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
{
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
platform :ios, '9.0'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

target 'Pedoer' do
# Pods for Pedoer
target 'FitEtc' do
# Pods for FitEtc
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
Expand Down Expand Up @@ -34,18 +34,18 @@ target 'Pedoer' do
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'

target 'PedoerTests' do
target 'FitEtcTests' do
inherit! :search_paths
# Pods for testing
end

use_native_modules!
end

target 'Pedoer-tvOS' do
# Pods for Pedoer-tvOS
target 'FitEtc-tvOS' do
# Pods for FitEtc-tvOS

target 'Pedoer-tvOSTests' do
target 'FitEtc-tvOSTests' do
inherit! :search_paths
# Pods for testing
end
Expand Down
Loading

0 comments on commit f38ce6c

Please sign in to comment.