From aa3864ce3d4d363a4f3bfac7b9525f463c5ce0bb Mon Sep 17 00:00:00 2001 From: Aditya Nair Date: Wed, 3 Oct 2018 20:36:53 +0530 Subject: [PATCH] moved static strings to strings.xml --- .idea/caches/build_file_checksums.ser | Bin 538 -> 535 bytes .idea/misc.xml | 2 +- app/.gitignore | 13 ++++++++++ .../java/org/gdgsrilanka/io/HomeActivity.java | 4 +-- .../org/gdgsrilanka/io/LoginActivity.java | 8 +++--- .../org/gdgsrilanka/io/subpages/Agenda.java | 2 +- .../org/gdgsrilanka/io/subpages/Feedback.java | 4 +-- .../gdgsrilanka/io/subpages/Questions.java | 4 +-- .../org/gdgsrilanka/io/subpages/Ticket.java | 6 ++--- .../main/res/layout/agenda_item_default.xml | 4 +-- app/src/main/res/layout/fragment_feedback.xml | 4 +-- .../main/res/layout/fragment_questions.xml | 6 ++--- app/src/main/res/layout/speaker_item.xml | 4 +-- app/src/main/res/values/strings.xml | 24 ++++++++++++++++++ 14 files changed, 61 insertions(+), 24 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 536b26267c25777a73c7fc161e0732f02e7fdfdc..1500f5783e3d61870a46086fe93c40685d22f287 100644 GIT binary patch delta 167 zcmbQmGM#0@3>GUd_RACJ_$%`lruhNHv1m?ULgLNXCyz=P)bum* zb5r#bQ!+~`6ZN5H>Q6qv7^zpnAdpy4pr2HlnUeyutdOCOfsKKIK_FW~Hgci*_0^}R M-42nuzl*y908~dnlmGw# delta 170 zcmbQvGK*!x3>E{qLje=#_y-6i78JxJm1gFo=%p7WrsSlS7BMhIJFWRF{)3GpL^O_(XWlWN$`UZNa3c_ZHNzX - + diff --git a/app/.gitignore b/app/.gitignore index 3543521..915be0a 100755 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,14 @@ /build +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +.idea/caches +.idea/*.xml +.idea/codeStyles +idea +idea/ +.idea \ No newline at end of file diff --git a/app/src/main/java/org/gdgsrilanka/io/HomeActivity.java b/app/src/main/java/org/gdgsrilanka/io/HomeActivity.java index 80005ae..1c49693 100755 --- a/app/src/main/java/org/gdgsrilanka/io/HomeActivity.java +++ b/app/src/main/java/org/gdgsrilanka/io/HomeActivity.java @@ -146,7 +146,7 @@ public boolean onOptionsItemSelected(MenuItem item) { if (id == R.id.action_logout) { AlertDialog.Builder builder1 = new AlertDialog.Builder(HomeActivity.this); - builder1.setMessage("Are you sure you want to logout?"); + builder1.setMessage(getString(R.string.logout_confirm_message)); builder1.setCancelable(true); builder1.setPositiveButton( @@ -186,7 +186,7 @@ public void UserSignOutFunction() { new ResultCallback() { @Override public void onResult(@NonNull Result result) { - Toast.makeText(HomeActivity.this, "Logout Successfully", Toast.LENGTH_LONG).show(); + Toast.makeText(HomeActivity.this, getString(R.string.logout_success_message), Toast.LENGTH_LONG).show(); Intent homedir = new Intent(HomeActivity.this,LoginActivity.class); startActivity(homedir); finish(); diff --git a/app/src/main/java/org/gdgsrilanka/io/LoginActivity.java b/app/src/main/java/org/gdgsrilanka/io/LoginActivity.java index f10199c..a5ddbca 100755 --- a/app/src/main/java/org/gdgsrilanka/io/LoginActivity.java +++ b/app/src/main/java/org/gdgsrilanka/io/LoginActivity.java @@ -96,12 +96,12 @@ public void onSuccess(LoginResult loginResult) { @Override public void onCancel() { - Snackbar.make(mRelativeLayout, "Login With Facebook Canceled", Snackbar.LENGTH_SHORT).show(); + Snackbar.make(mRelativeLayout, getString(R.string.fb_login_fail_message), Snackbar.LENGTH_SHORT).show(); } @Override public void onError(FacebookException exception) { - Snackbar.make(mRelativeLayout, "Error, Login Failed", Snackbar.LENGTH_SHORT).show(); + Snackbar.make(mRelativeLayout, getString(R.string.login_fail_message), Snackbar.LENGTH_SHORT).show(); } }); @@ -135,7 +135,7 @@ public void success(Result result) { @Override public void failure(TwitterException exception) { - Snackbar.make(mRelativeLayout, "Error, Login Failed", Snackbar.LENGTH_SHORT).show(); + Snackbar.make(mRelativeLayout, getString(R.string.login_fail_message), Snackbar.LENGTH_SHORT).show(); } }); @@ -195,7 +195,7 @@ public void onComplete(@NonNull Task AuthResultTask) { finish(); }else { - Toast.makeText(LoginActivity.this,"Something Went Wrong",Toast.LENGTH_LONG).show(); + Toast.makeText(LoginActivity.this,getString(R.string.firebase_login_error),Toast.LENGTH_LONG).show(); } } }); diff --git a/app/src/main/java/org/gdgsrilanka/io/subpages/Agenda.java b/app/src/main/java/org/gdgsrilanka/io/subpages/Agenda.java index cd4b370..0f2e963 100755 --- a/app/src/main/java/org/gdgsrilanka/io/subpages/Agenda.java +++ b/app/src/main/java/org/gdgsrilanka/io/subpages/Agenda.java @@ -52,7 +52,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa database = FirebaseDatabase.getInstance(); pd = new ProgressDialog(getActivity()); - pd.setMessage("Loading agenda"); + pd.setMessage(getString(R.string.progress_dialog_agenda)); pd.show(); return v; diff --git a/app/src/main/java/org/gdgsrilanka/io/subpages/Feedback.java b/app/src/main/java/org/gdgsrilanka/io/subpages/Feedback.java index 65fc8b9..9db21c2 100755 --- a/app/src/main/java/org/gdgsrilanka/io/subpages/Feedback.java +++ b/app/src/main/java/org/gdgsrilanka/io/subpages/Feedback.java @@ -54,7 +54,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa @Override public void onClick(View view) { if(question.getText().toString().trim().length() == 0){ - Toast.makeText(getContext(), "Please enter your feedback.", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), getString(R.string.toast_enter_feedback_message), Toast.LENGTH_SHORT).show(); } else { FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser(); if (user != null) { @@ -76,7 +76,7 @@ public void onClick(View view) { myRef.updateChildren(childUpdates); - Toast.makeText(getContext(),"Feedback successfully sent.",Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(),getString(R.string.toast_feedback_successully_sent),Toast.LENGTH_SHORT).show(); question.setText(""); } diff --git a/app/src/main/java/org/gdgsrilanka/io/subpages/Questions.java b/app/src/main/java/org/gdgsrilanka/io/subpages/Questions.java index d55000d..a70f594 100755 --- a/app/src/main/java/org/gdgsrilanka/io/subpages/Questions.java +++ b/app/src/main/java/org/gdgsrilanka/io/subpages/Questions.java @@ -54,7 +54,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, @Override public void onClick(View view) { if(question.getText().toString().trim().length() == 0){ - Toast.makeText(getContext(), "Please enter your question.", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), getString(R.string.toast_enter_question), Toast.LENGTH_SHORT).show(); } else { FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser(); if (user != null) { @@ -76,7 +76,7 @@ public void onClick(View view) { myRef.updateChildren(childUpdates); - Toast.makeText(getContext(),"Question successfully posted.",Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(),getString(R.string.toast_question_posted),Toast.LENGTH_SHORT).show(); question.setText(""); } diff --git a/app/src/main/java/org/gdgsrilanka/io/subpages/Ticket.java b/app/src/main/java/org/gdgsrilanka/io/subpages/Ticket.java index b6624b7..f1fe83f 100755 --- a/app/src/main/java/org/gdgsrilanka/io/subpages/Ticket.java +++ b/app/src/main/java/org/gdgsrilanka/io/subpages/Ticket.java @@ -64,7 +64,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa checkTicket.execute(email,token); } } else { - Toast.makeText(getContext(),"This feature requires an internet connection.",Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(),getString(R.string.toast_ticket_internet_connection),Toast.LENGTH_SHORT).show(); } return v; @@ -107,7 +107,7 @@ protected void onPreExecute() { super.onPreExecute(); regprogress = new ProgressDialog(getContext()); regprogress.setIndeterminate(true); - regprogress.setMessage("Getting details"); + regprogress.setMessage(getString(R.string.progress_dialog_ticket)); regprogress.show(); } @@ -153,7 +153,7 @@ protected void onPostExecute(String s) { regprogress.dismiss(); if(s.matches("invalid")){ - Toast.makeText(getContext(),"You have not been selected to attend the event.",Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(),getString(R.string.check_ticket_invalid),Toast.LENGTH_SHORT).show(); } else { String[] tokens = s.split("-", -1); ticketno.setText(tokens[0]); diff --git a/app/src/main/res/layout/agenda_item_default.xml b/app/src/main/res/layout/agenda_item_default.xml index 6ad9b5f..01c0218 100755 --- a/app/src/main/res/layout/agenda_item_default.xml +++ b/app/src/main/res/layout/agenda_item_default.xml @@ -43,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="sans-serif-condensed" - android:text="10.00 PM - 11.30 PM" + android:text="@string/agenda_item_time" android:textColor="#666" android:textSize="11sp" /> @@ -52,7 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/product_sans_regular" - android:text="Keynote by Dialog and Google" + android:text="@string/agenda_item_subheading" android:textColor="#fff" android:textSize="13sp" android:layout_marginTop="4dp"/> diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml index bc446ad..9ef92fb 100755 --- a/app/src/main/res/layout/fragment_feedback.xml +++ b/app/src/main/res/layout/fragment_feedback.xml @@ -34,7 +34,7 @@ android:background="@drawable/edittext" android:fontFamily="@font/product_sans_regular" android:gravity="top|left" - android:hint="Enter your message here" + android:hint="@string/feedback_hint" android:inputType="textMultiLine" android:lines="5" android:padding="10dp" @@ -49,7 +49,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:fontFamily="@font/product_sans_regular" - android:text="SEND FEEDBACK" + android:text="@string/feedback_fbsubmit" android:theme="@style/AppTheme.Button" /> diff --git a/app/src/main/res/layout/fragment_questions.xml b/app/src/main/res/layout/fragment_questions.xml index 7231697..e55f8c9 100755 --- a/app/src/main/res/layout/fragment_questions.xml +++ b/app/src/main/res/layout/fragment_questions.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="15dp" android:fontFamily="sans-serif-condensed" - android:text="QUESTIONS AND ANSWERS" + android:text="@string/question_heading" android:textAlignment="center" android:textColor="#fff" android:textSize="19sp" /> @@ -40,7 +40,7 @@ android:fontFamily="@font/product_sans_regular" android:textSize="15sp" android:padding="10dp" - android:hint="Enter your question here." + android:hint="@string/question_hint" android:textColorHint="#979797"/>