From 3923164850a54ef167ed15084ebf66cb393ccdd3 Mon Sep 17 00:00:00 2001
From: KGreg <kgreg314@gmail.com>
Date: Tue, 1 May 2018 17:46:02 +0200
Subject: [PATCH] Make more Package

---
 .../app/src/main/java/onlab/kvizserver/GameActivity.java     | 3 +++
 .../main/java/onlab/kvizserver/GameActivityPagerAdapter.java | 3 +++
 .../app/src/main/java/onlab/kvizserver/LobbyActivity.java    | 5 ++---
 .../onlab/kvizserver/{ => adapter}/ClientListAdapter.java    | 4 ++--
 .../onlab/kvizserver/{ => adapter}/QuestionListAdapter.java  | 5 +++--
 .../onlab/kvizserver/{ => fragment}/GameControlFragment.java | 4 +++-
 .../kvizserver/{ => fragment}/QuestionListFragment.java      | 4 +++-
 .../{ => fragment}/QuestionListGeneratorDialogFragment.java  | 4 ++--
 KvizServer/app/src/main/res/layout/fragment_game_control.xml | 2 +-
 .../app/src/main/res/layout/fragment_question_list.xml       | 2 +-
 .../res/layout/fragment_question_list_generator_dialog.xml   | 2 +-
 11 files changed, 24 insertions(+), 14 deletions(-)
 rename KvizServer/app/src/main/java/onlab/kvizserver/{ => adapter}/ClientListAdapter.java (96%)
 rename KvizServer/app/src/main/java/onlab/kvizserver/{ => adapter}/QuestionListAdapter.java (97%)
 rename KvizServer/app/src/main/java/onlab/kvizserver/{ => fragment}/GameControlFragment.java (99%)
 rename KvizServer/app/src/main/java/onlab/kvizserver/{ => fragment}/QuestionListFragment.java (97%)
 rename KvizServer/app/src/main/java/onlab/kvizserver/{ => fragment}/QuestionListGeneratorDialogFragment.java (98%)

diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
index 4df3b55..3512480 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java
@@ -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;
 
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivityPagerAdapter.java b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivityPagerAdapter.java
index 2ddc29b..d0e4f6c 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/GameActivityPagerAdapter.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/GameActivityPagerAdapter.java
@@ -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;
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java b/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
index e5b0e92..533dd0f 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java
@@ -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 {
         }
     }
 
+
 }
 
 
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/ClientListAdapter.java b/KvizServer/app/src/main/java/onlab/kvizserver/adapter/ClientListAdapter.java
similarity index 96%
rename from KvizServer/app/src/main/java/onlab/kvizserver/ClientListAdapter.java
rename to KvizServer/app/src/main/java/onlab/kvizserver/adapter/ClientListAdapter.java
index 8989d31..a8ae165 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/ClientListAdapter.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/adapter/ClientListAdapter.java
@@ -1,4 +1,4 @@
-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> {
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/QuestionListAdapter.java b/KvizServer/app/src/main/java/onlab/kvizserver/adapter/QuestionListAdapter.java
similarity index 97%
rename from KvizServer/app/src/main/java/onlab/kvizserver/QuestionListAdapter.java
rename to KvizServer/app/src/main/java/onlab/kvizserver/adapter/QuestionListAdapter.java
index dff741e..ddb3ab4 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/QuestionListAdapter.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/adapter/QuestionListAdapter.java
@@ -1,6 +1,5 @@
-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> {
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/GameControlFragment.java b/KvizServer/app/src/main/java/onlab/kvizserver/fragment/GameControlFragment.java
similarity index 99%
rename from KvizServer/app/src/main/java/onlab/kvizserver/GameControlFragment.java
rename to KvizServer/app/src/main/java/onlab/kvizserver/fragment/GameControlFragment.java
index ad3b874..f081290 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/GameControlFragment.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/fragment/GameControlFragment.java
@@ -1,4 +1,4 @@
-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";
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/QuestionListFragment.java b/KvizServer/app/src/main/java/onlab/kvizserver/fragment/QuestionListFragment.java
similarity index 97%
rename from KvizServer/app/src/main/java/onlab/kvizserver/QuestionListFragment.java
rename to KvizServer/app/src/main/java/onlab/kvizserver/fragment/QuestionListFragment.java
index b2d5934..61d6382 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/QuestionListFragment.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/fragment/QuestionListFragment.java
@@ -1,4 +1,4 @@
-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 {
diff --git a/KvizServer/app/src/main/java/onlab/kvizserver/QuestionListGeneratorDialogFragment.java b/KvizServer/app/src/main/java/onlab/kvizserver/fragment/QuestionListGeneratorDialogFragment.java
similarity index 98%
rename from KvizServer/app/src/main/java/onlab/kvizserver/QuestionListGeneratorDialogFragment.java
rename to KvizServer/app/src/main/java/onlab/kvizserver/fragment/QuestionListGeneratorDialogFragment.java
index ba4540e..ae5afa7 100644
--- a/KvizServer/app/src/main/java/onlab/kvizserver/QuestionListGeneratorDialogFragment.java
+++ b/KvizServer/app/src/main/java/onlab/kvizserver/fragment/QuestionListGeneratorDialogFragment.java
@@ -1,7 +1,6 @@
-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 {
diff --git a/KvizServer/app/src/main/res/layout/fragment_game_control.xml b/KvizServer/app/src/main/res/layout/fragment_game_control.xml
index fad518a..725ade1 100644
--- a/KvizServer/app/src/main/res/layout/fragment_game_control.xml
+++ b/KvizServer/app/src/main/res/layout/fragment_game_control.xml
@@ -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"
diff --git a/KvizServer/app/src/main/res/layout/fragment_question_list.xml b/KvizServer/app/src/main/res/layout/fragment_question_list.xml
index 780876c..f41e9e9 100644
--- a/KvizServer/app/src/main/res/layout/fragment_question_list.xml
+++ b/KvizServer/app/src/main/res/layout/fragment_question_list.xml
@@ -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"
diff --git a/KvizServer/app/src/main/res/layout/fragment_question_list_generator_dialog.xml b/KvizServer/app/src/main/res/layout/fragment_question_list_generator_dialog.xml
index 31a319e..a1bd3b8 100644
--- a/KvizServer/app/src/main/res/layout/fragment_question_list_generator_dialog.xml
+++ b/KvizServer/app/src/main/res/layout/fragment_question_list_generator_dialog.xml
@@ -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"
-- 
GitLab