diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1d1275b..b782eed 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c7382bd..4a2d62c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,7 @@ 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 ff7bc09..6deee2a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -1,13 +1,11 @@ package org.ntlab.radishforandroidstudio.cactusClient; import android.os.Bundle; -import android.os.Handler; import android.support.v4.app.Fragment; import android.support.v7.app.AppCompatActivity; import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.views.LoginFragment; -import org.ntlab.radishforandroidstudio.cactusClient.views.SplashScreenFragment; public class MainActivity extends AppCompatActivity { @@ -23,33 +21,24 @@ // } - SplashScreenFragment dialog; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTheme(R.style.SplashDialogTheme); + // splash + try { + Thread.sleep(10000); + + } catch (InterruptedException e) { + e.printStackTrace(); + } + + setTheme(R.style.AppTheme_NoActionBar); + + Fragment fragment; + fragment = new LoginFragment(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit(); setContentView(R.layout.activity_main); - - openSplashScreenFragment(); - - } - - private void openSplashScreenFragment() { - dialog = new SplashScreenFragment(); -// dialog.show(getFragmentManager(), "dialog"); - - dialog.show(getSupportFragmentManager(),"dialog"); - - Handler handler = new Handler(); - - handler.postDelayed(new Runnable() { - @Override - public void run() { - - dialog.dismiss(); - } - - }, 2000); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SplashScreenFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SplashScreenFragment.java deleted file mode 100644 index 3b95820..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SplashScreenFragment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.views; - -import android.app.Dialog; -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.util.DisplayMetrics; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.WindowManager; - -import org.ntlab.radishforandroidstudio.R; - -public class SplashScreenFragment extends DialogFragment { - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - Dialog dialog = getDialog(); - - WindowManager.LayoutParams lp = dialog.getWindow().getAttributes(); - - DisplayMetrics metrics = getResources().getDisplayMetrics(); - int dialogWidth = (int) (metrics.widthPixels * 0.8); - int dialogHeight = (int) (metrics.heightPixels * 0.8); - - lp.width = dialogWidth; - lp.height = dialogHeight; - dialog.getWindow().setAttributes(lp); - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - Dialog dialog = new Dialog(getActivity(), R.style.SplashDialogTheme); - // ダイアログをキャンセルできないようにする - setCancelable(false); - - return dialog; - } -} diff --git a/app/src/main/res/drawable/nittalab.png b/app/src/main/res/drawable/nittalab.png new file mode 100644 index 0000000..dcb8dbb --- /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..24f1bdc --- /dev/null +++ b/app/src/main/res/drawable/splash.xml @@ -0,0 +1,18 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_splash_screen.xml b/app/src/main/res/layout/fragment_splash_screen.xml deleted file mode 100644 index f578c8f..0000000 --- a/app/src/main/res/layout/fragment_splash_screen.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 928c455..64b137b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,9 +8,17 @@ @color/colorAccent - + +