Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
KGregPFerenc
AndroidOnlabKviz2018
Commits
39231648
Commit
39231648
authored
May 01, 2018
by
KGreg
Browse files
Make more Package
parent
41c1b120
Changes
11
Hide whitespace changes
Inline
Side-by-side
KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
View file @
39231648
...
...
@@ -31,6 +31,9 @@ import java.util.Iterator;
import
java.util.List
;
import
java.util.Map
;
import
onlab.kvizserver.fragment.GameControlFragment
;
import
onlab.kvizserver.fragment.QuestionListFragment
;
import
onlab.kvizserver.fragment.QuestionListGeneratorDialogFragment
;
import
onlab.kvizserver.model.PlayerAnswer
;
import
onlab.kvizserver.model.Question
;
...
...
KvizServer/app/src/main/java/onlab/kvizserver/GameActivityPagerAdapter.java
View file @
39231648
...
...
@@ -4,6 +4,9 @@ import android.support.v4.app.Fragment;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentPagerAdapter
;
import
onlab.kvizserver.fragment.GameControlFragment
;
import
onlab.kvizserver.fragment.QuestionListFragment
;
class
GameActivityPagerAdapter
extends
FragmentPagerAdapter
{
private
static
final
int
NUM_PAGES
=
2
;
private
GameControlFragment
gameControlFragment
;
...
...
KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
View file @
39231648
...
...
@@ -25,6 +25,7 @@ import java.net.ServerSocket;
import
java.net.Socket
;
import
java.util.ArrayList
;
import
onlab.kvizserver.adapter.ClientListAdapter
;
import
onlab.kvizserver.model.ClientModel
;
public
class
LobbyActivity
extends
AppCompatActivity
{
...
...
@@ -199,9 +200,6 @@ public class LobbyActivity extends AppCompatActivity {
Log
.
d
(
"TAG"
,
"Service Unregistered : "
+
serviceInfo
.
getServiceName
());
}
@Override
...
...
@@ -489,6 +487,7 @@ public class LobbyActivity extends AppCompatActivity {
}
}
}
...
...
KvizServer/app/src/main/java/onlab/kvizserver/ClientListAdapter.java
→
KvizServer/app/src/main/java/onlab/kvizserver/
adapter/
ClientListAdapter.java
View file @
39231648
package
onlab.kvizserver
;
package
onlab.kvizserver
.adapter
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
...
...
@@ -7,8 +7,8 @@ import android.view.ViewGroup;
import
android.widget.TextView
;
import
java.util.ArrayList
;
import
java.util.List
;
import
onlab.kvizserver.R
;
import
onlab.kvizserver.model.ClientModel
;
public
class
ClientListAdapter
extends
RecyclerView
.
Adapter
<
ClientListAdapter
.
ServerViewHolder
>
{
...
...
KvizServer/app/src/main/java/onlab/kvizserver/QuestionListAdapter.java
→
KvizServer/app/src/main/java/onlab/kvizserver/
adapter/
QuestionListAdapter.java
View file @
39231648
package
onlab.kvizserver
;
package
onlab.kvizserver
.adapter
;
import
android.content.Context
;
import
android.graphics.Color
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
...
...
@@ -13,6 +12,8 @@ import android.widget.TextView;
import
java.util.ArrayList
;
import
java.util.List
;
import
onlab.kvizserver.fragment.QuestionListFragment
;
import
onlab.kvizserver.R
;
import
onlab.kvizserver.model.Question
;
public
class
QuestionListAdapter
extends
RecyclerView
.
Adapter
<
QuestionListAdapter
.
QuestionViewHolder
>
{
...
...
KvizServer/app/src/main/java/onlab/kvizserver/GameControlFragment.java
→
KvizServer/app/src/main/java/onlab/kvizserver/
fragment/
GameControlFragment.java
View file @
39231648
package
onlab.kvizserver
;
package
onlab.kvizserver
.fragment
;
import
android.content.Context
;
import
android.os.Bundle
;
...
...
@@ -18,6 +18,8 @@ import android.widget.Toast;
import
java.util.ArrayList
;
import
java.util.List
;
import
onlab.kvizserver.R
;
public
class
GameControlFragment
extends
Fragment
{
private
static
final
String
NUMBER_OF_PLAYERS
=
"NUMBER_OF_PLAYERS"
;
...
...
KvizServer/app/src/main/java/onlab/kvizserver/QuestionListFragment.java
→
KvizServer/app/src/main/java/onlab/kvizserver/
fragment/
QuestionListFragment.java
View file @
39231648
package
onlab.kvizserver
;
package
onlab.kvizserver
.fragment
;
import
android.Manifest
;
import
android.content.Context
;
...
...
@@ -23,6 +23,8 @@ import java.util.Collections;
import
java.util.Iterator
;
import
java.util.List
;
import
onlab.kvizserver.R
;
import
onlab.kvizserver.adapter.QuestionListAdapter
;
import
onlab.kvizserver.model.Question
;
public
class
QuestionListFragment
extends
Fragment
{
...
...
KvizServer/app/src/main/java/onlab/kvizserver/QuestionListGeneratorDialogFragment.java
→
KvizServer/app/src/main/java/onlab/kvizserver/
fragment/
QuestionListGeneratorDialogFragment.java
View file @
39231648
package
onlab.kvizserver
;
package
onlab.kvizserver
.fragment
;
import
android.content.Context
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.v4.app.DialogFragment
;
import
android.view.LayoutInflater
;
...
...
@@ -16,6 +15,7 @@ import android.widget.TextView;
import
java.util.ArrayList
;
import
java.util.List
;
import
onlab.kvizserver.R
;
import
onlab.kvizserver.model.Question
;
public
class
QuestionListGeneratorDialogFragment
extends
DialogFragment
{
...
...
KvizServer/app/src/main/res/layout/fragment_game_control.xml
View file @
39231648
...
...
@@ -4,7 +4,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:padding=
"20dp"
tools:context=
".GameControlFragment"
>
tools:context=
".
fragment.
GameControlFragment"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
KvizServer/app/src/main/res/layout/fragment_question_list.xml
View file @
39231648
...
...
@@ -3,7 +3,7 @@
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
".QuestionListFragment"
>
tools:context=
".
fragment.
QuestionListFragment"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
KvizServer/app/src/main/res/layout/fragment_question_list_generator_dialog.xml
View file @
39231648
...
...
@@ -3,7 +3,7 @@
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
".QuestionListGeneratorDialogFragment"
>
tools:context=
".
fragment.
QuestionListGeneratorDialogFragment"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
Write
Preview
Supports
Markdown
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