diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..19aa6a5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java index da35e65..3a989e7 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java @@ -1,6 +1,10 @@ package org.ntlab.acanthus_client.views; +import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -14,17 +18,32 @@ import androidx.navigation.ui.NavigationUI; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity implements View.OnClickListener { private ActivityMainBinding binding; + private Button mBtDefault, mBtDark; + + private SharedPreferences mPreferences; + private SharedPreferences.Editor mEditor; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = ActivityMainBinding.inflate(getLayoutInflater()); + mPreferences = getSharedPreferences("themeData", MODE_PRIVATE); + setTheme( mPreferences.getInt("theme", R.style.Theme_Acanthus) ); setContentView(binding.getRoot()); + mBtDefault = (Button)findViewById(R.id.bt_default); + mBtDark = (Button)findViewById(R.id.bt_dark); + + mBtDefault.setOnClickListener(this); + mBtDark.setOnClickListener(this); + + mEditor = mPreferences.edit(); + BottomNavigationView navView = findViewById(R.id.nav_view); // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. @@ -36,4 +55,21 @@ NavigationUI.setupWithNavController(binding.navView, navController); } + @Override + public void onClick(View view) { + switch (view.getId()) { + case R.id.bt_default: { + mEditor.putInt("theme", R.style.Theme_Acanthus); + break; + } + case R.id.bt_dark: { + mEditor.putInt("theme", R.style.Theme_Acanthus_Dark); + break; + } + } + mEditor.commit(); + finish(); + startActivity( new Intent( this, MainActivity.class )); + } + } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java index 02a8149..6a1dab4 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java @@ -33,8 +33,7 @@ //ここに画像処理を記載する ImageView imageView = (ImageView) findViewById(R.id.gifImage); Glide.with(this).load(R.drawable.load).into(imageView); - TextView textView = (TextView)findViewById(R.id.textView3); - loadimg(imageView,textView); + loadimg(imageView); @@ -43,13 +42,12 @@ } //////////////////////////////////////////////////////////////////// - public void loadimg(ImageView imageView,TextView textView) { + public void loadimg(ImageView imageView) { Handler handler = new Handler(); Runnable runnable = new Runnable() { @Override public void run() { imageView.setVisibility(View.VISIBLE); - textView.setText("アカウント情報取得中"); } }; handler.postDelayed(runnable, 2000); diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index f2ac124..a5666df 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -22,67 +22,68 @@ + app:layout_constraintVertical_bias="0.857" /> + app:layout_constraintVertical_bias="0.855" /> + app:layout_constraintVertical_bias="1.0" /> + app:layout_constraintVertical_bias="0.972" /> + app:layout_constraintVertical_bias="0.616" />