From 3edea89d3a0475fdbbe147a7daf41fc78eca2d12 Mon Sep 17 00:00:00 2001 From: seungWonU Date: Mon, 2 Nov 2020 17:27:18 +0900 Subject: [PATCH] =?UTF-8?q?Add:=20ranking=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20rank=EA=B4=80=EB=A0=A8=20fragm?= =?UTF-8?q?ent=20=EC=83=9D=EC=84=B1=EA=B3=BC=20nav=5Frank=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 +- .../ui/SplashActivity.java | 3 +- .../ui/auth/AuthActivity.java | 1 - .../ui/ranking/FavorRankingFragment.java | 33 ++++++++++++ .../ui/ranking/MainRankingFragment.java | 49 ++++++++++++++++++ .../ui/ranking/RankingActivity.java | 30 +++++++++++ .../ui/ranking/WrongRankingFragment.java | 35 +++++++++++++ app/src/main/res/layout/activity_ranking.xml | 16 ++++++ .../res/layout/fragment_favor_ranking.xml | 27 ++++++++++ .../main/res/layout/fragment_main_ranking.xml | 50 +++++++++++++++++++ .../res/layout/fragment_wrong_ranking.xml | 27 ++++++++++ app/src/main/res/navigation/nav_rank.xml | 36 +++++++++++++ 12 files changed, 307 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/ranking/FavorRankingFragment.java create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/ranking/MainRankingFragment.java create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/ranking/RankingActivity.java create mode 100644 app/src/main/java/com/example/wordmemorizationgame/ui/ranking/WrongRankingFragment.java create mode 100644 app/src/main/res/layout/activity_ranking.xml create mode 100644 app/src/main/res/layout/fragment_favor_ranking.xml create mode 100644 app/src/main/res/layout/fragment_main_ranking.xml create mode 100644 app/src/main/res/layout/fragment_wrong_ranking.xml create mode 100644 app/src/main/res/navigation/nav_rank.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fd078ed..f371131 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java b/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java index 08f0217..b5e703d 100644 --- a/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java +++ b/app/src/main/java/com/example/wordmemorizationgame/ui/SplashActivity.java @@ -9,6 +9,7 @@ import com.example.wordmemorizationgame.R; import com.example.wordmemorizationgame.ui.auth.AuthActivity; import com.example.wordmemorizationgame.ui.main.MainActivity; +import com.example.wordmemorizationgame.ui.ranking.RankingActivity; public class SplashActivity extends AppCompatActivity { @@ -26,7 +27,7 @@ void startSplash() { @Override public void run() { // - Intent intent = new Intent(getApplicationContext(), AuthActivity.class); + Intent intent = new Intent(getApplicationContext(), RankingActivity.class); startActivity(intent); finish(); } diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/auth/AuthActivity.java b/app/src/main/java/com/example/wordmemorizationgame/ui/auth/AuthActivity.java index 393e30e..0db78cf 100644 --- a/app/src/main/java/com/example/wordmemorizationgame/ui/auth/AuthActivity.java +++ b/app/src/main/java/com/example/wordmemorizationgame/ui/auth/AuthActivity.java @@ -20,7 +20,6 @@ protected void onCreate(Bundle savedInstanceState) { NavController navController = Navigation.findNavController(this, R.id.nav_auth_fragment); appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build(); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); - } @Override diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/FavorRankingFragment.java b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/FavorRankingFragment.java new file mode 100644 index 0000000..276a338 --- /dev/null +++ b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/FavorRankingFragment.java @@ -0,0 +1,33 @@ +package com.example.wordmemorizationgame.ui.ranking; + +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.wordmemorizationgame.R; + +public class FavorRankingFragment extends Fragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_favor_ranking, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/MainRankingFragment.java b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/MainRankingFragment.java new file mode 100644 index 0000000..4deaee7 --- /dev/null +++ b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/MainRankingFragment.java @@ -0,0 +1,49 @@ +package com.example.wordmemorizationgame.ui.ranking; + +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.navigation.Navigation; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.wordmemorizationgame.R; + +public class MainRankingFragment extends Fragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_main_ranking, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + + view.findViewById(R.id.btn_mainrank_favor).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Navigation.findNavController(view).navigate(R.id.action_mainRankingFragment_to_favorRankingFragment); + } + }); + + view.findViewById(R.id.btn_mainrank_wrong).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Navigation.findNavController(view).navigate(R.id.action_mainRankingFragment_to_wrongRankingFragment); + } + }); + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/RankingActivity.java b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/RankingActivity.java new file mode 100644 index 0000000..ee6c1b1 --- /dev/null +++ b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/RankingActivity.java @@ -0,0 +1,30 @@ +package com.example.wordmemorizationgame.ui.ranking; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.navigation.NavController; +import androidx.navigation.Navigation; +import androidx.navigation.ui.AppBarConfiguration; +import androidx.navigation.ui.NavigationUI; + +import android.os.Bundle; + +import com.example.wordmemorizationgame.R; + +public class RankingActivity extends AppCompatActivity { + AppBarConfiguration appBarConfiguration; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_ranking); + + NavController navController = Navigation.findNavController(this, R.id.nav_rank_fragment); + appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build(); + NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); + } + + @Override + public boolean onSupportNavigateUp() { + NavController navController = Navigation.findNavController(this, R.id.nav_rank_fragment); + return NavigationUI.navigateUp(navController, appBarConfiguration) || super.onSupportNavigateUp(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/WrongRankingFragment.java b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/WrongRankingFragment.java new file mode 100644 index 0000000..a766ade --- /dev/null +++ b/app/src/main/java/com/example/wordmemorizationgame/ui/ranking/WrongRankingFragment.java @@ -0,0 +1,35 @@ +package com.example.wordmemorizationgame.ui.ranking; + +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.wordmemorizationgame.R; + + +public class WrongRankingFragment extends Fragment { + + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_wrong_ranking, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_ranking.xml b/app/src/main/res/layout/activity_ranking.xml new file mode 100644 index 0000000..2acd052 --- /dev/null +++ b/app/src/main/res/layout/activity_ranking.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_favor_ranking.xml b/app/src/main/res/layout/fragment_favor_ranking.xml new file mode 100644 index 0000000..caf667b --- /dev/null +++ b/app/src/main/res/layout/fragment_favor_ranking.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_ranking.xml b/app/src/main/res/layout/fragment_main_ranking.xml new file mode 100644 index 0000000..da5f7ee --- /dev/null +++ b/app/src/main/res/layout/fragment_main_ranking.xml @@ -0,0 +1,50 @@ + + + + + +