diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79cfb91..795735f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,14 +22,17 @@
android:theme="@style/AppTheme">
-
+ android:screenOrientation="landscape"
+ android:theme="@style/SplashTheme">
+
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
index a21946d..169053e 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
@@ -53,11 +53,11 @@
}
//MyAccountの追加
- public Account getMyAccount(){
+ public Account getMyAccount() {
return myAccount;
}
- public void setMyAccount(Account ac){
+ public void setMyAccount(Account ac) {
myAccount = ac;
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java
index ca51f9c..0e45aff 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java
@@ -5,7 +5,7 @@
import android.support.v7.app.AppCompatActivity;
import org.ntlab.radishforandroidstudio.R;
-import org.ntlab.radishforandroidstudio.cactusClient.views.LoginFragment;
+import org.ntlab.radishforandroidstudio.cactusClient.views.StartFragment;
public class MainActivity extends AppCompatActivity {
@@ -13,12 +13,23 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ //splash
+ // ここで5秒間スリープし、スプラッシュを表示させたままにする。
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ setTheme(R.style.AppTheme_NoActionBar);
setContentView(R.layout.activity_main);
+ //fragmentの設定
Fragment fragment;
- fragment = new LoginFragment();
+ fragment = new StartFragment();
getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit();
-
+ setContentView(R.layout.activity_main);
}
+
}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
index 5b6d935..fac885d 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java
@@ -6,6 +6,7 @@
import android.os.Bundle;
import org.ntlab.radishforandroidstudio.R;
+import org.ntlab.radishforandroidstudio.cactusClient.views.StartFragment;
public class SampleActivity extends AppCompatActivity {
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java
deleted file mode 100644
index 61c2011..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.ntlab.radishforandroidstudio.cactusClient.tests;
-
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import org.ntlab.radishforandroidstudio.R;
-import org.ntlab.radishforandroidstudio.cactusClient.views.PlayerFragment;
-
-public class StartFragment extends Fragment {
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- // Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_start, container, false);
- }
-
- @Override
- public void onStart() {
- super.onStart();
-
- Button button = getActivity().findViewById(R.id.start_button);
- button.setOnClickListener(new View.OnClickListener(){
- @Override
- public void onClick(View view) {
- FragmentManager manager = getFragmentManager();
- FragmentTransaction transaction = manager.beginTransaction();
-// transaction.replace(R.id.framelayout_field, new SampleUiFragment());
-// transaction.replace(R.id.framelayout_field, new SampleGameFragment());
-// transaction.replace(R.id.framelayout_field,new SampleGame2Fragment());
- transaction.replace(R.id.framelayout_field,new PlayerFragment());
- transaction.addToBackStack(null);
- transaction.commit();
- }
- });
- }
-}
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java
new file mode 100644
index 0000000..a665386
--- /dev/null
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java
@@ -0,0 +1,39 @@
+package org.ntlab.radishforandroidstudio.cactusClient.views;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.ntlab.radishforandroidstudio.R;
+
+public class StartFragment extends Fragment {
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_start, container, false);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ Button button = getActivity().findViewById(R.id.start_button);
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ FragmentManager manager = getFragmentManager();
+ FragmentTransaction transaction = manager.beginTransaction();
+ transaction.replace(R.id.fragment_place, new LoginFragment());
+ transaction.commit();
+ }
+ });
+ }
+}
diff --git a/app/src/main/res/drawable/nittalab.png b/app/src/main/res/drawable/nittalab.png
new file mode 100644
index 0000000..94547b5
--- /dev/null
+++ b/app/src/main/res/drawable/nittalab.png
Binary files differ
diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
new file mode 100644
index 0000000..91a9688
--- /dev/null
+++ b/app/src/main/res/drawable/splash.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ -
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ef10842..287a02e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,20 +4,29 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".cactusClient.MainActivity"
- android:id="@+id/fragment_place"
- tools:layout_editor_absoluteY="73dp">
+ tools:context=".cactusClient.MainActivity">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml
index f9d8f19..c4aa179 100644
--- a/app/src/main/res/layout/fragment_start.xml
+++ b/app/src/main/res/layout/fragment_start.xml
@@ -1,24 +1,39 @@
-
+ tools:context=".cactusClient.views.StartFragment">
-
+ android:layout_marginBottom="37dp"
+ android:text="Start"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..1346d5d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,149 @@
#3F51B5
#303F9F
#FF4081
+
+
+ #FF000000
+ #FF696969
+ #FF808080
+ #FFa9a9a9
+ #FFc0c0c0
+ #FFd3d3d3
+ #FFdcdcdc
+ #FFf5f5f5
+ #FFffffff
+ #FFfffafa
+ #FFf8f8ff
+ #FFfffaf0
+ #FFfaf0e6
+ #FFfaebd7
+ #FFffefd5
+ #FFffebcd
+ #FFffe4c4
+ #FFffe4b5
+ #ffdead
+ #FFffdab9
+ #FFffe4e1
+ #FFfff0f5
+ #FFfff5ee
+ #FFfdf5e6
+ #FFfffff0
+ #FFf0fff0
+ #FFf5fffa
+ #FFf0ffff
+ #FFf0f8ff
+ #FFe6e6fa
+ #FFb0c4de
+ #FF778899
+ #FF708090
+ #FF4682b4
+ #FF4169e1
+ #FF191970
+ #FF000080
+ #FF00008b
+ #FF0000cd
+ #FF0000ff
+ #FF1e90ff
+ #FF6495ed
+ #FF00bfff
+ #FF87cefa
+ #FF87ceeb
+ #FFadd8e6
+ #FFb0e0e6
+ #FFafeeee
+ #FFe0ffff
+ #FF00ffff
+ #FF00ffff
+ #FF40e0d0
+ #FF48d1cc
+ #FF00ced1
+ #FF20b2aa
+ #5f9ea0
+ #FF008b8b
+ #FF008080
+ #FF2f4f4f
+ #FF006400
+ #FF008000
+ #FF228b22
+ #FF2e8b57
+ #FF3cb371
+ #FF66cdaa
+ #FF8fbc8f
+ #FF7fffd4
+ #FF98fb98
+ #FF90ee90
+ #FF00ff7f
+ #FF00fa9a
+ #FF7cfc00
+ #FF7fff00
+ #FFadff2f
+ #FF00ff00
+ #FF32cd32
+ #FF9acd32
+ #FF556b2f
+ #FF6b8e23
+ #FF808000
+ #FFbdb76b
+ #FFeee8aa
+ #FFfff8dc
+ #FFf5f5dc
+ #FFffffe0
+ #FFfafad2
+ #FFfffacd
+ #FFf5deb3
+ #FFdeb887
+ #FFd2b48c
+ #FFf0e68c
+ #FFffff00
+ #FFffd700
+ #FFffa500
+ #FFf4a460
+ #FFff8c00
+ #FFdaa520
+ #FFcd853f
+ #FFb8860b
+ #FFd2691e
+ #FFa0522d
+ #FF8b4513
+ #FF800000
+ #FF8b0000
+ #FFa52a2a
+ #FFb22222
+ #FFcd5c5c
+ #FFbc8f8f
+ #FFe9967a
+ #FFf08080
+ #FFfa8072
+ #FFffa07a
+ #FFff7f50
+ #FFff6347
+ #FFff4500
+ #FFff0000
+ #FFdc143c
+ #FFc71585
+ #FFff1493
+ #FFff69b4
+ #FFdb7093
+ #FFffc0cb
+ #FFffb6c1
+ #FFd8bfd8
+ #FFff00ff
+ #FFff00ff
+ #FFee82ee
+ #FFdda0dd
+ #FFda70d6
+ #FFba55d3
+ #FF9932cc
+ #FF9400d3
+ #FF8b008b
+ #FF800080
+ #FF4b0082
+ #FF483d8b
+ #FF8a2be2
+ #FF9370db
+ #FF6a5acd
+ #FF7b68ee
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ae17f3..447e61c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
- RadishForAndroidStudio
+ Cactus
Settings
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..64b137b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,4 +8,17 @@
- @color/colorAccent
+
+
+
+
+
+
+
+