diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4a2d62c..795735f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,26 +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/MainActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java index 6deee2a..296047e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -10,31 +10,20 @@ public class MainActivity extends AppCompatActivity { -// @Override -// protected void onCreate(Bundle savedInstanceState) { -// super.onCreate(savedInstanceState); -// setContentView(R.layout.activity_main); -// -// Fragment fragment; -// fragment = new LoginFragment(); -// getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit(); - - // } - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // splash + //splash + // ここで3秒間スリープし、スプラッシュを表示させたままにする。 try { - Thread.sleep(10000); - + Thread.sleep(2500); } catch (InterruptedException e) { e.printStackTrace(); } setTheme(R.style.AppTheme_NoActionBar); - + setContentView(R.layout.activity_main); + //fragmentの設定 Fragment fragment; fragment = new LoginFragment(); getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit(); diff --git a/app/src/main/res/drawable/nittalab.png b/app/src/main/res/drawable/nittalab.png index dcb8dbb..94547b5 100644 --- a/app/src/main/res/drawable/nittalab.png +++ 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 index 24f1bdc..c7545f7 100644 --- a/app/src/main/res/drawable/splash.xml +++ b/app/src/main/res/drawable/splash.xml @@ -1,14 +1,10 @@ - + android:layout_height="match_parent" + android:opacity="opaque"> - - + #3F51B5 #303F9F #FF4081 + #ffffff