Commit 52583c3a authored by Lennart Bader's avatar Lennart Bader
Browse files

Renamed Account to Settings

parent 3fd8dc08
......@@ -2,29 +2,19 @@ package de.mytfg.apps.vplan.activities;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.NavigationView;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.widget.DrawerLayout;
import android.support.v4.widget.NestedScrollView;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.ProgressBar;
import de.mytfg.apps.vplan.R;
import de.mytfg.apps.vplan.api.MyTFGApi;
import de.mytfg.apps.vplan.fragments.AboutFragment;
import de.mytfg.apps.vplan.fragments.AccountFragment;
import de.mytfg.apps.vplan.fragments.SettingsFragment;
import de.mytfg.apps.vplan.fragments.LoginFragment;
import de.mytfg.apps.vplan.fragments.PlanFragment;
import de.mytfg.apps.vplan.fragments.StartFragment;
......@@ -81,7 +71,7 @@ public class MainActivity extends AppCompatActivity {
return true;
case R.id.mainmenu_account:
navi.clear();
navi.navigate(new AccountFragment(), R.id.fragment_container);
navi.navigate(new SettingsFragment(), R.id.fragment_container);
return true;
case R.id.mainmenu_about:
navi.clear();
......
......@@ -44,12 +44,12 @@ import de.mytfg.apps.vplan.api.ApiParams;
import de.mytfg.apps.vplan.api.MyTFGApi;
import de.mytfg.apps.vplan.objects.User;
public class AccountFragment extends Fragment {
public class SettingsFragment extends Fragment {
private View view;
private MainActivity context;
public AccountFragment() {
public SettingsFragment() {
}
@Nullable
......@@ -61,7 +61,7 @@ public class AccountFragment extends Fragment {
setHasOptionsMenu(true);
context.getToolbarManager()
.clear()
.setTitle(getString(R.string.menutitle_account))
.setTitle(getString(R.string.menutitle_settings))
.setExpandable(true, true);
MyTFGApi api = new MyTFGApi(context);
......
......@@ -12,7 +12,7 @@
<group android:id="@+id/menu_group_2">
<item android:id="@+id/mainmenu_account"
android:icon="@drawable/ic_menu_account"
android:title="@string/menutitle_account" />
android:title="@string/menutitle_settings" />
</group>
<group android:id="@+id/menu_group_3">
<item android:id="@+id/mainmenu_about"
......
......@@ -11,7 +11,7 @@
<!-- VPlan Menu -->
<string name="menutitle_home">Start</string>
<string name="menutitle_plan">VPlan</string>
<string name="menutitle_account">Mein Account</string>
<string name="menutitle_settings">Account &amp; Einstellungen</string>
<string name="menutitle_login">Anmelden</string>
<string name="menutitle_about">Über diese App</string>
......
......@@ -12,7 +12,7 @@
<string name="menutitle_home">Home</string>
<string name="menutitle_plan">Plan</string>
<string name="menutitle_login">Login</string>
<string name="menutitle_account">My Account</string>
<string name="menutitle_settings">Account &amp; Settings</string>
<string name="menutitle_about">About this App</string>
<!-- HOME -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment