From 0a578e9a28b1513dc4b7200574848233555311ba Mon Sep 17 00:00:00 2001
From: Kacper Ziubryniewicz <kapi2289@gmail.com>
Date: Wed, 2 Oct 2019 12:19:12 +0200
Subject: [PATCH] Move help and feedback to the other module

---
 app/src/main/AndroidManifest.xml                              | 2 +-
 app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt  | 4 ++--
 .../ui/modules/{base => feedback}/FeedbackActivity.java       | 2 +-
 .../ui/modules/{base => feedback}/FeedbackFragment.kt         | 2 +-
 .../edziennik/ui/modules/{base => feedback}/HelpFragment.kt   | 2 +-
 .../edziennik/ui/modules/login/LoginChooserFragment.java      | 2 +-
 app/src/main/res/layout/activity_feedback.xml                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/{base => feedback}/FeedbackActivity.java (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/{base => feedback}/FeedbackFragment.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/{base => feedback}/HelpFragment.kt (96%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3234ebac..991589de 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
             android:label="@string/messages_compose_title"
             android:theme="@style/AppTheme.Black" />
         <activity
-            android:name=".ui.modules.base.FeedbackActivity"
+            android:name=".ui.modules.feedback.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index e2835336..6cf8dec7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -60,8 +60,8 @@ import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment
 import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment
 import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
-import pl.szczodrzynski.edziennik.ui.modules.base.FeedbackFragment
-import pl.szczodrzynski.edziennik.ui.modules.base.HelpFragment
+import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
+import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java
index a1625acd..bb62522e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.base;
+package pl.szczodrzynski.edziennik.ui.modules.feedback;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.databinding.DataBindingUtil;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
index 4351a6f7..fd1d04bc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.base
+package pl.szczodrzynski.edziennik.ui.modules.feedback
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/HelpFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/HelpFragment.kt
index d54e0fc6..e7dfb5cc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/HelpFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.base
+package pl.szczodrzynski.edziennik.ui.modules.feedback
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
index 8615d2aa..a2547b3a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity;
+import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginChooserBinding;
 
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 491780d5..503b0e60 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".ui.modules.base.FeedbackActivity">
+        tools:context=".ui.modules.feedback.FeedbackActivity">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"