Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mytfg
mytfg-vplan-app
Commits
67e916eb
Commit
67e916eb
authored
Jan 22, 2017
by
Lennart Bader
Browse files
Renamed fragment_account to fragment_settings
parent
52583c3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/de/mytfg/apps/vplan/fragments/SettingsFragment.java
View file @
67e916eb
package
de.mytfg.apps.vplan.fragments
;
import
android.app.ProgressDialog
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.StringDef
;
import
android.support.design.widget.CoordinatorLayout
;
import
android.support.design.widget.Snackbar
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.text.TextUtilsCompat
;
import
android.support.v7.app.AlertDialog
;
import
android.text.Html
;
import
android.text.TextUtils
;
...
...
@@ -27,11 +24,6 @@ import org.json.JSONArray;
import
org.json.JSONException
;
import
org.json.JSONObject
;
import
java.sql.Timestamp
;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -55,7 +47,7 @@ public class SettingsFragment extends Fragment {
@Nullable
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
@Nullable
final
ViewGroup
container
,
@Nullable
Bundle
savedInstanceState
)
{
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_
account
,
container
,
false
);
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_
settings
,
container
,
false
);
final
MainActivity
context
=
(
MainActivity
)
this
.
getActivity
();
this
.
context
=
context
;
setHasOptionsMenu
(
true
);
...
...
app/src/main/res/layout/fragment_
account
.xml
→
app/src/main/res/layout/fragment_
settings
.xml
View file @
67e916eb
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment