Skip to content

Commit

Permalink
Extracted String Resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hashik-Donthineni
Hashik-Donthineni committed Feb 27, 2020
1 parent ee3e054 commit 6c09f67
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 19 deletions.
12 changes: 6 additions & 6 deletions app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
View file
Expand Up @@ -85,10 +85,10 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) {
savedInstanceState.getString("Title");
tv.setText(savedInstanceState.getString("SubTitle"));
savedInstanceState.getString(getResources().getString(R.string.Title));
tv.setText(savedInstanceState.getString(getResources().getString(R.string.SubTitle)));
if (mButtonText != null) {
button.setText(savedInstanceState.getString("ButtonText"));
button.setText(savedInstanceState.getString(getResources().getString(R.string.ButtonText)));
}

}
Expand All @@ -97,10 +97,10 @@ public void onActivityCreated(Bundle savedInstanceState) {
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString("Title", mTitle);
outState.putString("SubTitle", mSubTitle);
outState.putString(getResources().getString(R.string.Title), mTitle);
outState.putString(getResources().getString(R.string.SubTitle), mSubTitle);
if (mButtonText != null) {
outState.putString("ButtonText", mButtonText);
outState.putString(getResources().getString(R.string.ButtonText), mButtonText);
}
}

Expand Down
29 changes: 16 additions & 13 deletions app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
View file
Expand Up @@ -4,12 +4,15 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import android.util.Log;
import android.view.View;

import com.github.paolorotolo.appintro.AppIntro;

import org.torproject.android.R;
import org.torproject.android.service.util.Prefs;
import org.torproject.android.settings.LocaleHelper;
Expand All @@ -28,13 +31,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

if (savedInstanceState != null) {
welcome = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "welcome");
intro2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "intro2");
cs2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "cs2");
welcome = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.WelcomeFragment));
intro2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.Intro2Fragment));
cs2 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.CS2Fragment));
if (PermissionManager.isLollipopOrHigher())
cs3 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, "cs3");
cs3 = (CustomSlideBigText) getSupportFragmentManager().getFragment(savedInstanceState, getResources().getString(R.string.CS3Fragment));

}else{
} else {
// Instead of fragments, you can also use our default slide
// Just set a title, description, background and image. AppIntro will do the rest.
welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
Expand All @@ -52,7 +55,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
cs2.showButton(getString(R.string.action_more), new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class));
startActivity(new Intent(OnboardingActivity.this, BridgeWizardActivity.class));
}
});
addSlide(cs2);
Expand Down Expand Up @@ -113,13 +116,13 @@ protected void onSaveInstanceState(Bundle outState) {
}

//Should check if the fragment exists in the fragment manager or else it'll flag error
if(count >= 1)
getSupportFragmentManager().putFragment(outState, "welcome", welcome);
if(count >= 2)
getSupportFragmentManager().putFragment(outState, "intro2", intro2);
if(count >=3)
getSupportFragmentManager().putFragment(outState, "cs2", cs2);
if (count >= 1)
getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.WelcomeFragment), welcome);
if (count >= 2)
getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.Intro2Fragment), intro2);
if (count >= 3)
getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.CS2Fragment), cs2);
if (count >= 4 && PermissionManager.isLollipopOrHigher())
getSupportFragmentManager().putFragment(outState, "cs3", cs3);
getSupportFragmentManager().putFragment(outState, getResources().getString(R.string.CS3Fragment), cs3);
}
}
7 changes: 7 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Expand Up @@ -259,4 +259,11 @@
<string name="app_services">App services</string>
<string name="default_socks_http">SOCKS: - HTTP: -</string>
<string name="refresh_apps">Refresh Apps</string>
<string name="Title">Title</string>
<string name="SubTitle">SubTitle</string>
<string name="ButtonText">ButtonText</string>
<string name="WelcomeFragment">welcome</string>
<string name="Intro2Fragment">intro2</string>
<string name="CS2Fragment">cs2</string>
<string name="CS3Fragment">cs3</string>
</resources>

0 comments on commit 6c09f67

Please sign in to comment.