diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java index 5545ec5..252ca4b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java @@ -34,11 +34,13 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag private SharedPreferences.Editor editor = null; + Toolbar toolbar; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_settings); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -131,6 +133,7 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag protected void onResume() { super.onResume(); updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar.setTitle(R.string.title_activity_settings); } private static boolean updateResources(Context context, String language) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 3311208..e1cf55c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -69,12 +69,15 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic String lat, lon; GoogleApiClient mGoogleApiClient; ArrayList coverage_list; + Toolbar toolbar; protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_storeimage); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + preferences = PreferenceManager.getDefaultSharedPreferences(this); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -84,10 +87,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic btn_save = (Button) findViewById(R.id.btn_save_selfie); - preferences = PreferenceManager.getDefaultSharedPreferences(this); - - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); - store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); @@ -353,6 +352,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic protected void onResume() { super.onResume(); updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar.setTitle(R.string.title_activity_store_image); } protected void onStart() {