Skip to content
Snippets Groups Projects
Commit f78f0879 authored by Alasdair Bruce's avatar Alasdair Bruce
Browse files

Lab Tuesday Update

parent bcffe617
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 146 additions and 37 deletions
MyTestApp/.idea/caches/build_file_checksums.ser
+ 0
− 0
View file @ f78f0879
No preview for this file type
MyTestApp/.idea/caches/gradle_models.ser deleted 100644 → 0
+ 0
− 0
View file @ bcffe617
File deleted
MyTestApp/.idea/gradle.xml
+ 6
− 3
View file @ f78f0879
......@@ -3,11 +3,14 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
......
MyTestApp/.idea/misc.xml
+ 26
− 1
View file @ f78f0879
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
MyTestApp/.idea/vcs.xml deleted 100644 → 0
+ 0
− 6
View file @ bcffe617
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
MyTestApp/app/src/main/java/com/cs991/ywb18142/mytestapp/Book.java
+ 5
− 0
View file @ f78f0879
......@@ -10,6 +10,11 @@ public class Book {
author = "";
}
public Book(String title, String author) {
this.title = title;
this.author = author;
}
public String getTitle() {
return title;
......
MyTestApp/app/src/main/java/com/cs991/ywb18142/mytestapp/BookDatabase.java
+ 11
− 0
View file @ f78f0879
......@@ -20,4 +20,15 @@ public class BookDatabase {
books.add(book);
}
public Book search(String title) {
for (int i = 0; i < books.size(); i++) {
if (title.equals(books.get(i).getTitle())) {
return books.get(i);
}
}
Book b = new Book();
return b;
}
}
MyTestApp/app/src/main/java/com/cs991/ywb18142/mytestapp/MainActivity.java
+ 39
− 18
View file @ f78f0879
......@@ -5,40 +5,61 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
public class MainActivity extends AppCompatActivity {
public static final String EXTRA_MESSAGE = "com.cs991.ywb18142.mytestapp.MESSAGE";
private UserDatabase users;
private BookDatabase books;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
users = new UserDatabase();
books = new BookDatabase();
}
// public void sendMessage(View view){
// send btn
public void sendMessage(View view){
EditText editText1 = (EditText) findViewById(R.id.editText1);
EditText editText2 = (EditText) findViewById(R.id.editText2);
String message1 = editText1.getText().toString();
String message2 = editText2.getText().toString();
books.addBook(new Book(message1, message2));
}
// //display users
// public void displayUsers(View view){
// String userPrint = "";
// Intent intent = new Intent(this, DisplayMessageActivity.class);
// EditText editText = (EditText) findViewById(R.id.editText);
// String message = editText.getText().toString();
// intent.putExtra(EXTRA_MESSAGE, message);
// for (int i = 0; i < books.getBooks().size(); i++){
// userPrint = userPrint + books.getBooks().get(i).getAuthor() + books.getBooks().get(i).getTitle() + "\n";
// }
// intent.putExtra(EXTRA_MESSAGE, userPrint);
// startActivity(intent);
// }
public void sendMessage(View view){
EditText editText = (EditText) findViewById(R.id.editText);
String message = editText.getText().toString();
users.addUser(new User(message));
}
//display users
public void searchByTitle(View view){
TextView textView1 = findViewById((R.id.textView2));
textView1.setText("");
EditText editText1 = findViewById(R.id.editText3);
String message1 = editText1.getText().toString();
Book book1 = books.search(message1);
if(book1 != null){
textView1.setText(book1.getAuthor());
}
else {
textView1.setText(R.string.search_rejection);
public void displayUsers(View view){
String userPrint = "";
Intent intent = new Intent(this, DisplayMessageActivity.class);
for (int i = 0; i < users.getUsers().size(); i++){
userPrint = userPrint + users.getUsers().get(i).getName() + "\n";
}
intent.putExtra(EXTRA_MESSAGE, userPrint);
startActivity(intent);
}
}
MyTestApp/app/src/main/res/layout/activity_main.xml
+ 55
− 8
View file @ f78f0879
......@@ -7,14 +7,14 @@
tools:context=".MainActivity">
<EditText
android:id="@+id/editText"
android:id="@+id/editText1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:ems="10"
android:hint="@string/edit_message"
android:hint="@string/edit_message1"
android:inputType="textPersonName"
app:layout_constraintEnd_toStartOf="@+id/button"
app:layout_constraintHorizontal_bias="0.5"
......@@ -31,18 +31,65 @@
android:layout_marginStart="16dp"
android:onClick="sendMessage"
android:text="@string/button_send"
app:layout_constraintBaseline_toBaselineOf="@+id/editText"
app:layout_constraintBaseline_toBaselineOf="@+id/editText1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/editText" />
app:layout_constraintStart_toEndOf="@+id/editText1" />
<EditText
android:id="@+id/editText2"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:ems="10"
android:hint="@string/edit_message2"
android:inputType="textPersonName"
app:layout_constraintEnd_toStartOf="@+id/button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editText1" />
<EditText
android:id="@+id/editText3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="108dp"
android:ems="10"
android:hint="@string/search_text"
android:inputType="textPersonName"
app:layout_constraintEnd_toStartOf="@+id/button2"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editText2" />
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="displayUsers"
android:text="Display Users"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:onClick="searchByTitle"
android:text="Search"
app:layout_constraintBaseline_toBaselineOf="@+id/editText3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/editText3" />
<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toStartOf="@+id/button2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/editText3" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
MyTestApp/app/src/main/res/values/strings.xml
+ 4
− 1
View file @ f78f0879
<resources>
<string name="app_name">My Test App</string>
<string name="edit_message">Enter a message</string>
<string name="edit_message1">Enter an Author</string>
<string name="edit_message2">Enter a Title</string>
<string name="button_send">Send</string>
<string name="search_text">Search by title</string>
<string name="search_rejection">No Book By Title</string>
</resources>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment