Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3469a34
Merge pull request #1 from sookmile/feature/mainScreen
ej11240 Aug 9, 2021
4b391ed
feat: 탐험기능 카메라 추가
Byunwoojin Aug 10, 2021
8ab69ac
Merge pull request #2 from sookmile/feature/explore
ReeseSR Aug 10, 2021
b208194
feat: explore screen 구현
Byunwoojin Aug 10, 2021
66081e0
Merge commit '7c961df3b7b1b0c122f11cc49a6612a40b7c8745' into feature/…
Byunwoojin Aug 10, 2021
05ec81e
Merge pull request #3 from sookmile/feature/explore
ReeseSR Aug 10, 2021
60b4bef
Merge pull request #4 from sookmile/feature/mainScreen
Byunwoojin Aug 10, 2021
b247905
fix : RN Camera android 오류 해결
Byunwoojin Aug 10, 2021
ed84ee3
Merge pull request #5 from sookmile/feature/explore
ReeseSR Aug 10, 2021
9d5d180
feat : 탐험 페이지 사진 기능 구현
Byunwoojin Aug 10, 2021
afa5b00
BackgroundImage
Aug 10, 2021
5b5e310
Merge pull request #6 from sookmile/feature/explore
Byunwoojin Aug 10, 2021
30e4cb0
test
Aug 10, 2021
165ee00
feat : add image
Aug 10, 2021
cc37e75
Merge pull request #8 from sookmile/bgi
SeryeongK Aug 10, 2021
401c893
feat: explore 페이지 이동
Byunwoojin Aug 11, 2021
b5a830d
Merge pull request #9 from sookmile/feature/explore
Byunwoojin Aug 11, 2021
ed4a6b4
fix : camera design 변경
Byunwoojin Aug 11, 2021
a4f9468
Merge pull request #10 from sookmile/feature/explore
Byunwoojin Aug 11, 2021
36f2d3a
fix : linear-graident module
Byunwoojin Aug 11, 2021
f1c3de2
Merge pull request #11 from sookmile/feature/explore
Byunwoojin Aug 11, 2021
314a9aa
fix : flashMode off
Byunwoojin Aug 11, 2021
1663122
Merge pull request #12 from sookmile/feature/explore
Byunwoojin Aug 11, 2021
73e9ee7
fix : linear-gradient module
Byunwoojin Aug 11, 2021
56db3ac
fix : 탐험 페이지 navigation 추가
Byunwoojin Aug 11, 2021
ce08ac6
fix : 탐험 페이지 분할
Byunwoojin Aug 11, 2021
fda84b4
Merge pull request #13 from sookmile/feature/explore
Byunwoojin Aug 11, 2021
1131d74
- fix : page structure
Byunwoojin Aug 14, 2021
7773250
feat : add ExplorePage image
Byunwoojin Sep 5, 2021
9d446c1
Merge pull request #14 from sookmile/feature/explore
Byunwoojin Sep 5, 2021
aadc6d0
feat: Add SplashScreen
Sep 6, 2021
07601b1
feat: Add Screens
Sep 7, 2021
99fb98b
fix: Push error
Sep 7, 2021
dd3e055
fix: Large file error
Sep 8, 2021
b48c69a
fix: Organize nested navigation
Sep 8, 2021
27e6cad
- components > Start/Story/Game/Explore
Sep 8, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 45 additions & 6 deletions App.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,64 @@
import React from 'react';
import React, {useEffect} from 'react';
import {NavigationContainer} from '@react-navigation/native';
import {createStackNavigator} from '@react-navigation/stack';
import SplashScreen from 'react-native-splash-screen';

//Screens
import HomeScreen from './src/screens/HomeScreen';
import Start from './src/screens/StartScreen';
import Story from './src/screens/StoryScreen';
import Game from './src/screens/GameScreen';
import Explore from './src/screens/ExploreScreen';
import Settings from './src/screens/Settings';

//Tabs
import NavTab from './src/screens/NavTabs';

const Stack = createStackNavigator();
const MainStack = createStackNavigator();

const App = () => {
useEffect(() => {
SplashScreen.hide();
}, []);
return (
<NavigationContainer>
<Stack.Navigator initialRouteName={'Home'}>
<Stack.Screen
<MainStack.Navigator
initialRouteName={'Home'}
headerMode="none"
screenOptions={{
headerShown: false,
}}>
<MainStack.Screen
name="Start"
component={Start}
options={{headerShown: false}}
/>
<MainStack.Screen
name="NavTab"
component={NavTab}
options={{headerShown: false}}
/>
</Stack.Navigator>
<MainStack.Screen
name="Story"
component={Story}
options={{headerShown: false}}
/>
<MainStack.Screen
name="Game"
component={Game}
options={{headerShown: false}}
/>
<MainStack.Screen
name="Explore"
component={Explore}
options={{headerShown: false}}
/>

<MainStack.Screen
name="Settings"
component={Settings}
options={{headerShown: false}}
/>
</MainStack.Navigator>
</NavigationContainer>
);
};
Expand Down
10 changes: 10 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ android {
applicationId "com.marimo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
missingDimensionStrategy 'react-native-camera', 'general'
versionCode 1
versionName "1.0"
}
Expand Down Expand Up @@ -210,6 +211,8 @@ dependencies {
} else {
implementation jscFlavor
}
compile project(':@react-native-community_cameraroll')

}

// Run this once to be able to run the application with BUCK
Expand All @@ -220,3 +223,10 @@ task copyDownloadableDepsToLibs(type: Copy) {
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)


ext {
react = [
nodeExecutableAndArgs: ["/usr/local/bin/node"]
]
}
28 changes: 20 additions & 8 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,31 @@
android:name=".MainApplication"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_launcher"
android:allowBackup="false"
android:theme="@style/AppTheme">

<!-- SplashActivity를 추가하시면 됩니다. -->
<activity
android:name=".SplashActivity"
android:theme="@style/SplashTheme"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<!-- MainActivity안에 있는 intent-filter를 제거해주시고, android:exported="true"를 추가해주시면 됩니다. -->
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:windowSoftInputMode="adjustResize"
android:exported="true"/>

<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
</manifest>

</manifest>
648 changes: 648 additions & 0 deletions android/app/src/main/assets/index.android.bundle

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions android/app/src/main/java/com/marimo/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
package com.marimo;

import com.facebook.react.ReactActivity;
import org.devio.rn.splashscreen.SplashScreen;
import android.os.Bundle;

public class MainActivity extends ReactActivity {

/**
* Returns the name of the main component registered from JavaScript. This is used to schedule
* rendering of the component.
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
SplashScreen.show(this);
super.onCreate(savedInstanceState);
}
@Override
protected String getMainComponentName() {
return "Marimo";
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/java/com/marimo/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.BV.LinearGradient.LinearGradientPackage;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
Expand Down
16 changes: 16 additions & 0 deletions android/app/src/main/java/com/marimo/SplashActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.marimo;

import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;

public class SplashActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions android/app/src/main/res/drawable/background_splash.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item
android:drawable="@color/splashscreen_bg"/>

<item
android:width="300dp"
android:height="300dp"
android:drawable="@mipmap/splash_icon"
android:gravity="center" />

</layer-list>
7 changes: 7 additions & 0 deletions android/app/src/main/res/layout/launch_screen.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_splash"
android:orientation="vertical">
</LinearLayout>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions android/app/src/main/res/raw/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "Marimo",
"displayName": "Marimo"
}
5 changes: 5 additions & 0 deletions android/app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="splashscreen_bg">#ffffff</color>
<color name="app_bg">#ffffff</color>
</resources>
22 changes: 18 additions & 4 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<!-- 베이스 입니다. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- 여기부터 원하는 테마로 변경하시면 됩니다. -->
<item name="android:textColor">#000000</item>

<!-- 다음 줄을 추가하여 모든 앱의 기본 상태 표시 줄 색상을 설정하시면 됩니다. -->
<item name="android:statusBarColor">@color/app_bg</item>
<!-- 모든 앱의 기본 상태 표시 줄 텍스트 색상을 설정하려면 다음 줄을 추가하시면 됩니다.
밝은 색 => (false) / 어두운 색 => (true) -->
<item name="android:windowLightStatusBar">false</item>
<!-- 다음 줄을 추가하여 모든 앱의 기본 배경색을 설정하시면 됩니다. -->
<item name="android:windowBackground">@color/app_bg</item>
</style>

<!-- 스플래시 화면의 정의를 추가하시면 됩니다. -->
<style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:statusBarColor">@color/splashscreen_bg</item>
<item name="android:background">@drawable/background_splash</item>
</style>

</resources>
</resources>
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ allprojects {
jcenter()
maven { url 'https://www.jitpack.io' }
}
}
}
5 changes: 5 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
rootProject.name = 'Marimo'
include ':react-native-linear-gradient'
project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
include ':@react-native-community_cameraroll'
project(':@react-native-community_cameraroll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/cameraroll/android')

88 changes: 0 additions & 88 deletions ios/Marimo.xcodeproj/xcshareddata/xcschemes/Marimo.xcscheme

This file was deleted.

10 changes: 0 additions & 10 deletions ios/Marimo.xcworkspace/contents.xcworkspacedata

This file was deleted.

8 changes: 8 additions & 0 deletions ios/Marimo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Loading