diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8fa9d16..bfa1a42 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df802cd..f503258 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ + android:label="@string/title_activity_login" /> + \ No newline at end of file diff --git a/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java b/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java index e54c7e3..268c6bf 100644 --- a/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java +++ b/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java @@ -21,15 +21,23 @@ public class MainActivity extends AppCompatActivity { setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); + final Context context = this; - FloatingButton(); + //Floating Button + FloatingActionButton fab = findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(context, RentActivity.class); + startActivity(intent); + } + }); } @Override protected void onStart() { super.onStart(); //pre-condition: Is there a login key? - Context context = this; SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE); String defaultValue = "nokey"; String loginKey = sharedPref.getString("loginKey", defaultValue); @@ -61,14 +69,4 @@ public class MainActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } - private void FloatingButton() { - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); - } }