Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved static strings to strings.xml #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions app/src/main/java/org/gdgsrilanka/io/HomeActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/gdgsrilanka/io/LoginActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
});

Expand Down Expand Up @@ -135,7 +135,7 @@ public void success(Result<TwitterSession> 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();
}
});

Expand Down Expand Up @@ -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();
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/gdgsrilanka/io/subpages/Agenda.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/gdgsrilanka/io/subpages/Feedback.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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("");

}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/gdgsrilanka/io/subpages/Questions.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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("");

}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/gdgsrilanka/io/subpages/Ticket.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/agenda_item_default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand All @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_feedback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" />

</LinearLayout>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_questions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -40,15 +40,15 @@
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"/>

<Button
android:id="@+id/qsubmit"
android:layout_width="match_parent"
android:layout_height="50dp"
android:theme="@style/AppTheme.Button"
android:text="ASK"
android:text="@string/qssubmit_text"
android:fontFamily="@font/product_sans_regular"/>

</LinearLayout>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/speaker_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:fontFamily="@font/product_sans_regular"
android:text="Speaker Name"
android:text="@string/speaker_title"
android:textAlignment="viewStart"
android:textColor="#fff"
android:textSize="15sp" />
Expand All @@ -58,7 +58,7 @@
android:layout_marginRight="5dp"
android:layout_marginTop="4dp"
android:fontFamily="sans-serif-condensed"
android:text="Speaker Role"
android:text="@string/speaker_role"
android:textAlignment="viewStart"
android:textColor="#666"
android:textSize="13sp" />
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,28 @@

<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>

<string name="agenda_item_time">10.00 PM - 11.30 PM</string>
<string name="agenda_item_subheading">Keynote by Dialog and Google</string>
<string name="feedback_hint">Enter your message here</string>
<string name="feedback_fbsubmit">SEND FEEDBACK</string>
<string name="question_hint">Enter your question here.</string>
<string name="qssubmit_text">ASK</string>
<string name="question_heading">QUESTIONS AND ANSWERS</string>
<string name="speaker_title">Speaker Name</string>
<string name="speaker_role">Speaker Role</string>
<string name="progress_dialog_agenda">Loading agenda</string>
<string name="toast_enter_feedback_message">Please enter your feedback.</string>
<string name="toast_feedback_successully_sent">Feedback successfully sent.</string>
<string name="toast_enter_question">Please enter your question.</string>
<string name="toast_question_posted">Question successfully posted.</string>
<string name="toast_ticket_internet_connection">This feature requires an internet connection.</string>
<string name="progress_dialog_ticket">Getting details</string>
<string name="check_ticket_invalid">You have not been selected to attend the event.</string>
<string name="logout_confirm_message">Are you sure you want to logout?</string>
<string name="logout_success_message">Logout Successfully</string>

<string name="login_fail_message">Error, Login Failed</string>
<string name="fb_login_fail_message">Login With Facebook Canceled</string>
<string name="firebase_login_error">Something Went Wrong</string>
</resources>