From 7073b080be1b1310e02058e8b89f1f0b5ab58bda Mon Sep 17 00:00:00 2001 From: Jennifer Yang <76457965+jenniferjinyoungyang@users.noreply.github.com> Date: Sun, 13 Aug 2023 20:28:09 -0400 Subject: [PATCH] [Task 35] Fix Android Studio Warnings (#157) --- app/build.gradle | 11 ++- .../controllers/chat/ChatController.java | 2 +- .../ConversationListController.java | 2 +- .../tindar/entities/TindarMessage.java | 71 +++---------------- .../tindar/ui/chat/ChatActivity.java | 29 ++------ .../ui/chat/ChatRecyclerViewAdapter.java | 1 - .../ConversationListFragment.java | 5 +- .../MyConversationRecyclerViewAdapter.java | 7 +- .../tindar/ui/home/HomeFragment.java | 1 - .../ui/home/SecondViewProfileFragment.java | 39 +++++----- .../tindar/ui/home/ViewProfileFragment.java | 37 +++++----- .../ConversationResponseModel.java | 6 +- app/src/main/res/drawable/ic_edit.xml | 4 -- app/src/main/res/drawable/ic_save.xml | 4 -- .../main/res/layout/activity_change_email.xml | 12 ++-- .../res/layout/activity_change_password.xml | 12 ++-- app/src/main/res/layout/activity_chat.xml | 10 +-- app/src/main/res/layout/activity_login.xml | 1 - app/src/main/res/layout/activity_main.xml | 1 - app/src/main/res/layout/activity_settings.xml | 3 +- app/src/main/res/layout/activity_sign_up.xml | 15 ++-- app/src/main/res/layout/content_blank_nav.xml | 3 +- app/src/main/res/layout/dropdown_item.xml | 1 - .../main/res/layout/fragment_conversation.xml | 7 +- .../layout/fragment_second_view_profile.xml | 5 -- .../main/res/layout/fragment_view_profile.xml | 5 -- .../popup_current_password_incorrect.xml | 2 - .../res/layout/popup_email_already_used.xml | 2 - .../res/layout/popup_inputs_dont_match.xml | 2 - .../res/layout/popup_password_not_long.xml | 2 - .../res/layout/popup_wrong_credentials.xml | 3 +- .../main/res/menu/activity_main_drawer.xml | 2 +- app/src/main/res/values-land/dimens.xml | 4 +- app/src/main/res/values-night/themes.xml | 4 -- app/src/main/res/values-w1240dp/dimens.xml | 4 +- app/src/main/res/values-w600dp/dimens.xml | 4 +- app/src/main/res/values/dimens.xml | 4 -- app/src/main/res/values/ids.xml | 1 - app/src/main/res/values/strings.xml | 17 ++--- 39 files changed, 126 insertions(+), 219 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_edit.xml delete mode 100644 app/src/main/res/drawable/ic_save.xml diff --git a/app/build.gradle b/app/build.gradle index f28abf49..79d676ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ android { defaultConfig { applicationId "com.courseproject.tindar" minSdk 24 + //noinspection OldTargetApi //the maximum recommended compile SDK version for Android Gradle plugin 8.0.2 is 33 targetSdk 33 versionCode 1 versionName "1.0" @@ -34,24 +35,28 @@ android { dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' + //noinspection AnnotationProcessorOnCompilePath //project does not complie without this line compileOnly 'org.projectlombok:lombok:1.18.28' annotationProcessor 'org.projectlombok:lombok:1.18.28' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' + //noinspection GradleDependency //requires libraries and applications that depend on it to compile against version 34 or later implementation 'androidx.navigation:navigation-fragment:2.6.0' + //noinspection GradleDependency ////requires libraries and applications that depend on it to compile against version 34 or later implementation 'androidx.navigation:navigation-ui:2.6.0' - implementation 'androidx.test:monitor:1.5.0' + implementation 'androidx.test:monitor:1.6.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + //noinspection DifferentStdlibGradleVersion //This is not something we understand so prefer not to touch it implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") } diff --git a/app/src/main/java/com/courseproject/tindar/controllers/chat/ChatController.java b/app/src/main/java/com/courseproject/tindar/controllers/chat/ChatController.java index e3c2295a..18b0cabc 100644 --- a/app/src/main/java/com/courseproject/tindar/controllers/chat/ChatController.java +++ b/app/src/main/java/com/courseproject/tindar/controllers/chat/ChatController.java @@ -8,7 +8,7 @@ public class ChatController { - ChatInputBoundary userInput; + private final ChatInputBoundary userInput; public ChatController(ChatInputBoundary chatUserInput) { this.userInput = chatUserInput; diff --git a/app/src/main/java/com/courseproject/tindar/controllers/conversationlist/ConversationListController.java b/app/src/main/java/com/courseproject/tindar/controllers/conversationlist/ConversationListController.java index 0a874a1f..dd192185 100644 --- a/app/src/main/java/com/courseproject/tindar/controllers/conversationlist/ConversationListController.java +++ b/app/src/main/java/com/courseproject/tindar/controllers/conversationlist/ConversationListController.java @@ -23,7 +23,7 @@ public class ConversationListController { // // Takes user input frontend and pass it onto Interactor - ConversationListInputBoundary userInput; + private final ConversationListInputBoundary userInput; public ConversationListController(ConversationListInputBoundary conversationListUserInput){ diff --git a/app/src/main/java/com/courseproject/tindar/entities/TindarMessage.java b/app/src/main/java/com/courseproject/tindar/entities/TindarMessage.java index 2cc294d3..ac10f5b6 100644 --- a/app/src/main/java/com/courseproject/tindar/entities/TindarMessage.java +++ b/app/src/main/java/com/courseproject/tindar/entities/TindarMessage.java @@ -2,6 +2,8 @@ import java.sql.Timestamp; +import lombok.Getter; + /** * Models Tindar text messages which have been processed by the database (have message IDs). * Implements MessageModel. @@ -10,101 +12,50 @@ public class TindarMessage implements MessageModel { /** * the content of the message */ - private final String text; + @Getter private final String messageContent; /** * the time at which this message was created */ - private final Timestamp creationTime; + @Getter private final Timestamp creationTime; /** * the userID of the account that sent this message. * should be an integer represented as a string. */ - private final String sentFromId; + @Getter private final String sentFromId; /** * the userID of the account receiving this message. * should be an integer represented as a string. */ - private final String sentToId; + @Getter private final String sentToId; /** * the unique ID representing this message. * should be an integer represented as a string. */ - private final String messageId; + @Getter private final String messageId; /** * the ID of the conversation where this message was sent. * should be an integer represented as a string. */ - private final String conversationId; + @Getter private final String conversationId; /** * Creates a representation of a Tindar text message. * Note that all ID parameters should be integers represented as strings. - * @param text the content of the message + * @param messageContent the content of the message * @param timestamp the time at which this message was created * @param sentFromId the userID of the account that sent this message * @param sentToId the userID of the account receiving this message * @param messageId the unique ID representing this message * @param conversationId the ID of the conversation where this message was sent */ - public TindarMessage(String text, Timestamp timestamp, String sentFromId, String sentToId, + public TindarMessage(String messageContent, Timestamp timestamp, String sentFromId, String sentToId, String messageId, String conversationId){ - this.text = text; + this.messageContent = messageContent; this.creationTime = timestamp; this.sentFromId = sentFromId; this.sentToId = sentToId; this.messageId = messageId; this.conversationId = conversationId; } - - /** - * @return the messageId for this message. should be an integer represented as a string. - */ - @Override - public String getMessageId() { - return this.messageId; - } - - /** - * @return the time at which this message was created - */ - @Override - public Timestamp getCreationTime() { - return this.creationTime; - } - - /** - * @return a string representing the content of this message - */ - @Override - public String getMessageContent() { - return this.text; - } - - /** - * @return the userID of the one who sent this message. - * should be an integer represented as a string. - */ - @Override - public String getSentFromId() { - return this.sentFromId; - } - - /** - * @return the userID of the account receiving this message. - * should be an integer represented as a string. - */ - @Override - public String getSentToId() { - return this.sentToId; - } - - /** - * @return the ID of the conversation where this message was sent. - * should be an integer represented as a string. - */ - @Override - public String getConversationId() { - return this.conversationId; - } } diff --git a/app/src/main/java/com/courseproject/tindar/ui/chat/ChatActivity.java b/app/src/main/java/com/courseproject/tindar/ui/chat/ChatActivity.java index d25ea772..17b16649 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/chat/ChatActivity.java +++ b/app/src/main/java/com/courseproject/tindar/ui/chat/ChatActivity.java @@ -15,7 +15,6 @@ import com.courseproject.tindar.controllers.chat.ChatController; import com.courseproject.tindar.ds.DatabaseHelper; -import com.courseproject.tindar.entities.MessageModel; // TODO: remove TindarMessage import when database is properly connected import com.courseproject.tindar.usecases.chat.ChatInputBoundary; @@ -24,7 +23,6 @@ // TODO: consider removing Timestamp import when database is properly connected import java.sql.Timestamp; -import java.util.ArrayList; /** * For the one-on-one chat screen for specific conversations. @@ -59,25 +57,12 @@ public class ChatActivity extends AppCompatActivity { private String conversationId; - /** - * Display name of current user's conversation partner. - * Needed to display the proper info onscreen so that users know who they're chatting with. - */ - private String conversationPartnerDisplayName; - - /** Displays name of current user's conversation partner. */ - private TextView conversationPartnerDisplayNameDisplay; - /** List of messages that are already loaded and ready to be displayed by RecyclerView. */ - private ArrayList loadedMessages; - /** Chat controller handling user inputs */ private ChatController chatController; /** Where the user types their messages. */ private EditText chatInput; - /** Displays messages. */ - private RecyclerView chatRecyclerView; /** Still not sure what this does. I think this manages chatRecyclerView. */ private ChatRecyclerViewAdapter adapter; @@ -98,20 +83,18 @@ protected void onCreate(Bundle savedInstanceState) { // - flagged in issue #51 this.userId = intent.getStringExtra("current_user_id"); this.otherUserId = intent.getStringExtra("conversation_partner_id"); - this.conversationPartnerDisplayName - = intent.getStringExtra("conversation_partner_display_name"); + String conversationPartnerDisplayName = intent.getStringExtra("conversation_partner_display_name"); ChatInputBoundary chatInteractor = new ChatInteractor(DatabaseHelper.getInstance(getApplicationContext())); this.chatController = new ChatController(chatInteractor); // setting input and view instance variables to match what's in the display - this.conversationPartnerDisplayNameDisplay - = findViewById(R.id.conversation_partner_display_name); + TextView conversationPartnerDisplayNameDisplay = findViewById(R.id.conversation_partner_display_name); this.chatInput = findViewById(R.id.new_chat_input); // getting the screen to display the correct name for the conversation partner - this.conversationPartnerDisplayNameDisplay.setText(this.conversationPartnerDisplayName); + conversationPartnerDisplayNameDisplay.setText(conversationPartnerDisplayName); this.conversationId = this.chatController.getConversationId(this.userId, this.otherUserId); @@ -122,9 +105,9 @@ protected void onCreate(Bundle savedInstanceState) { this.userId); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); - this.chatRecyclerView = findViewById(R.id.chat_recycler_view); // matches recycler to layout - this.chatRecyclerView.setAdapter(adapter); - this.chatRecyclerView.setLayoutManager(linearLayoutManager); + RecyclerView chatRecyclerView = findViewById(R.id.chat_recycler_view); // matches recycler to layout + chatRecyclerView.setAdapter(adapter); + chatRecyclerView.setLayoutManager(linearLayoutManager); } // TODO: this should be refactored. diff --git a/app/src/main/java/com/courseproject/tindar/ui/chat/ChatRecyclerViewAdapter.java b/app/src/main/java/com/courseproject/tindar/ui/chat/ChatRecyclerViewAdapter.java index caedee33..422fd8eb 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/chat/ChatRecyclerViewAdapter.java +++ b/app/src/main/java/com/courseproject/tindar/ui/chat/ChatRecyclerViewAdapter.java @@ -3,7 +3,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/courseproject/tindar/ui/conversationlist/ConversationListFragment.java b/app/src/main/java/com/courseproject/tindar/ui/conversationlist/ConversationListFragment.java index 0eee4db0..35bc9c2c 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/com/courseproject/tindar/ui/conversationlist/ConversationListFragment.java @@ -32,8 +32,6 @@ public class ConversationListFragment extends Fragment { // TODO: Customize parameter argument names private static final String ARG_COLUMN_COUNT = "column-count"; - // TODO: Customize parameters - private int mColumnCount = 1; String userId; RecyclerView recyclerView; @@ -63,7 +61,8 @@ public void onCreate(Bundle savedInstanceState) { blankNavViewModel.getUserId().observe(requireActivity(), it -> userId = it); if (getArguments() != null) { - mColumnCount = getArguments().getInt(ARG_COLUMN_COUNT); + // TODO: Customize parameters + int mColumnCount = getArguments().getInt(ARG_COLUMN_COUNT); } } diff --git a/app/src/main/java/com/courseproject/tindar/ui/conversationlist/MyConversationRecyclerViewAdapter.java b/app/src/main/java/com/courseproject/tindar/ui/conversationlist/MyConversationRecyclerViewAdapter.java index 33b6b038..ce0d0507 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/conversationlist/MyConversationRecyclerViewAdapter.java +++ b/app/src/main/java/com/courseproject/tindar/ui/conversationlist/MyConversationRecyclerViewAdapter.java @@ -4,6 +4,7 @@ import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.courseproject.tindar.databinding.FragmentConversationBinding; @@ -32,8 +33,9 @@ public MyConversationRecyclerViewAdapter(List items) mValues = items; } + @NonNull @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { return new ViewHolder(FragmentConversationBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); @@ -60,7 +62,7 @@ public int getItemCount() { return mValues.size(); } - public class ViewHolder extends RecyclerView.ViewHolder { + public static class ViewHolder extends RecyclerView.ViewHolder { public final TextView mUserName; public final TextView mLastMessage; public final TextView mLastMessageTime; @@ -75,6 +77,7 @@ public ViewHolder(FragmentConversationBinding binding) { } + @NonNull @Override public String toString() { return super.toString() + " '" + mLastMessage.getText() + "'"; diff --git a/app/src/main/java/com/courseproject/tindar/ui/home/HomeFragment.java b/app/src/main/java/com/courseproject/tindar/ui/home/HomeFragment.java index e9d58161..8bfcd1ea 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/home/HomeFragment.java +++ b/app/src/main/java/com/courseproject/tindar/ui/home/HomeFragment.java @@ -5,7 +5,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.TextView; import android.widget.Button; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/courseproject/tindar/ui/home/SecondViewProfileFragment.java b/app/src/main/java/com/courseproject/tindar/ui/home/SecondViewProfileFragment.java index b6912156..9833d0f9 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/home/SecondViewProfileFragment.java +++ b/app/src/main/java/com/courseproject/tindar/ui/home/SecondViewProfileFragment.java @@ -1,11 +1,6 @@ package com.courseproject.tindar.ui.home; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Color; -import android.graphics.drawable.Drawable; -import android.os.AsyncTask; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -38,7 +33,6 @@ import com.courseproject.tindar.usecases.viewprofile.ViewProfileInputBoundary; import com.courseproject.tindar.usecases.viewprofile.ViewProfileInteractor; -import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -67,7 +61,7 @@ public class SecondViewProfileFragment extends Fragment { ViewProfilesController viewProfilesController; - DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy", Locale.CANADA ); + private final DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy", Locale.CANADA ); /** * Loads initial data for screen. @@ -197,18 +191,25 @@ private void setsProfile() { // This is only a temporary implementation for demo purposes. // The plan is to download pic from an external source and show it. profileLink = profile.getProfilePictureLink(); - if (profileLink.equals("spongebob1.png")){ - profilePic.setImageResource(R.drawable.spongebob1); - } else if (profileLink.equals("spongebob2.jpg")) { - profilePic.setImageResource(R.drawable.spongebob2); - } else if (profileLink.equals("spongebob3.jpg")) { - profilePic.setImageResource(R.drawable.spongebob3); - } else if (profileLink.equals("spongebob4.jpg")) { - profilePic.setImageResource(R.drawable.spongebob4); - } else if (profileLink.equals("spongebob5.jpg")) { - profilePic.setImageResource(R.drawable.spongebob5); - } else { - profilePic.setImageResource(R.drawable.kermit); + switch (profileLink) { + case "spongebob1.png": + profilePic.setImageResource(R.drawable.spongebob1); + break; + case "spongebob2.jpg": + profilePic.setImageResource(R.drawable.spongebob2); + break; + case "spongebob3.jpg": + profilePic.setImageResource(R.drawable.spongebob3); + break; + case "spongebob4.jpg": + profilePic.setImageResource(R.drawable.spongebob4); + break; + case "spongebob5.jpg": + profilePic.setImageResource(R.drawable.spongebob5); + break; + default: + profilePic.setImageResource(R.drawable.kermit); + break; } displayNameView.setText(profile.getDisplayName()); diff --git a/app/src/main/java/com/courseproject/tindar/ui/home/ViewProfileFragment.java b/app/src/main/java/com/courseproject/tindar/ui/home/ViewProfileFragment.java index 57b6871e..04fddc4e 100644 --- a/app/src/main/java/com/courseproject/tindar/ui/home/ViewProfileFragment.java +++ b/app/src/main/java/com/courseproject/tindar/ui/home/ViewProfileFragment.java @@ -1,9 +1,6 @@ package com.courseproject.tindar.ui.home; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Color; -import android.os.AsyncTask; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -36,7 +33,6 @@ import com.courseproject.tindar.usecases.viewprofile.ViewProfileInputBoundary; import com.courseproject.tindar.usecases.viewprofile.ViewProfileInteractor; -import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -65,7 +61,7 @@ public class ViewProfileFragment extends Fragment { ViewProfilesController viewProfilesController; - DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy", Locale.CANADA ); + private final DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy", Locale.CANADA ); /** * Loads initial data for screen. @@ -190,18 +186,25 @@ private void setsProfile() { // This is only a temporary implementation for demo purposes. // The plan is to download pic from an external source and show it. profileLink = profile.getProfilePictureLink(); - if (profileLink.equals("spongebob1.png")){ - profilePic.setImageResource(R.drawable.spongebob1); - } else if (profileLink.equals("spongebob2.jpg")) { - profilePic.setImageResource(R.drawable.spongebob2); - } else if (profileLink.equals("spongebob3.jpg")) { - profilePic.setImageResource(R.drawable.spongebob3); - } else if (profileLink.equals("spongebob4.jpg")) { - profilePic.setImageResource(R.drawable.spongebob4); - } else if (profileLink.equals("spongebob5.jpg")) { - profilePic.setImageResource(R.drawable.spongebob5); - } else { - profilePic.setImageResource(R.drawable.kermit); + switch (profileLink) { + case "spongebob1.png": + profilePic.setImageResource(R.drawable.spongebob1); + break; + case "spongebob2.jpg": + profilePic.setImageResource(R.drawable.spongebob2); + break; + case "spongebob3.jpg": + profilePic.setImageResource(R.drawable.spongebob3); + break; + case "spongebob4.jpg": + profilePic.setImageResource(R.drawable.spongebob4); + break; + case "spongebob5.jpg": + profilePic.setImageResource(R.drawable.spongebob5); + break; + default: + profilePic.setImageResource(R.drawable.kermit); + break; } displayNameView.setText(profile.getDisplayName()); diff --git a/app/src/main/java/com/courseproject/tindar/usecases/conversationlist/ConversationResponseModel.java b/app/src/main/java/com/courseproject/tindar/usecases/conversationlist/ConversationResponseModel.java index 7a24dcff..ea0266a2 100644 --- a/app/src/main/java/com/courseproject/tindar/usecases/conversationlist/ConversationResponseModel.java +++ b/app/src/main/java/com/courseproject/tindar/usecases/conversationlist/ConversationResponseModel.java @@ -24,12 +24,12 @@ public class ConversationResponseModel { /** * Constructs a new ConversationResponseModel object with the provided details. * - * @param conversationPartnerId + * @param conversationPartnerId the user id of the conversation partner * @param conversationPartnerName the display name of the conversation partner * // @param lastMessage a preview of their last message * // @param lastMessageTime a time stamp of their last message - * @param lastMessage - * @param lastMessageTime + * @param lastMessage the last message of the conversation + * @param lastMessageTime the creation time of the last message of the conversation */ public ConversationResponseModel(String conversationPartnerId, String conversationPartnerName, String lastMessage, String lastMessageTime){ this.conversationPartnerId = conversationPartnerId; diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml deleted file mode 100644 index 0261ad78..00000000 --- a/app/src/main/res/drawable/ic_edit.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml deleted file mode 100644 index 8e1b7932..00000000 --- a/app/src/main/res/drawable/ic_save.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_change_email.xml b/app/src/main/res/layout/activity_change_email.xml index a4054223..c4a28928 100644 --- a/app/src/main/res/layout/activity_change_email.xml +++ b/app/src/main/res/layout/activity_change_email.xml @@ -16,7 +16,8 @@ android:layout_marginStart="0dp" android:layout_marginTop="0dp" android:backgroundTint="@color/colorPrimary" - app:srcCompat="@drawable/baseline_arrow_back_32_white" /> + app:srcCompat="@drawable/baseline_arrow_back_32_white" + android:contentDescription="@string/tap_here_to_go_back" /> + android:textSize="15sp" + android:autofillHints="Email" /> + android:textSize="15sp" + android:autofillHints="Retype Email" /> + android:textSize="15sp" + android:autofillHints="Current Password" /> + app:srcCompat="@drawable/baseline_arrow_back_32_white" + android:contentDescription="@string/tap_here_to_go_back" /> + android:textSize="15sp" + android:autofillHints="New Password" /> + android:textSize="15sp" + android:autofillHints="Retype New Password" /> + android:textSize="15sp" + android:autofillHints="Current Password" /> + android:contentDescription="@string/tap_here_to_go_back" /> @@ -59,9 +59,9 @@ android:layout_width="match_parent" android:layout_centerVertical="true" android:layout_toStartOf="@id/button_send_message" - android:hint="Message" + android:hint="@string/message" android:inputType="text" - /> + android:autofillHints="" /> + android:contentDescription="@string/tap_to_send_your_typed_message" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4d6178eb..d546cec2 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ae6c28d6..6a07809f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,6 @@ diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index f31ac013..721329b7 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -13,7 +13,8 @@ android:backgroundTint="@color/colorPrimary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/baseline_arrow_back_32_white" /> + app:srcCompat="@drawable/baseline_arrow_back_32_white" + android:contentDescription="@string/tap_here_to_go_back" />