From a81fdb4fb162a55c90cc1d083693e3cbd9f53645 Mon Sep 17 00:00:00 2001
From: Fred Medlin <fmedlin@gmail.com>
Date: Wed, 18 Mar 2020 10:22:05 -0400
Subject: [PATCH] Resolve lib-ui resources

---
 .idea/.name                                         |  1 +
 .idea/codeStyles/Project.xml                        |  3 +++
 .idea/misc.xml                                      |  2 +-
 lib-resources/src/main/AndroidManifest.xml          |  2 +-
 lib-ui/build.gradle                                 |  1 +
 lib-ui/src/main/AndroidManifest.xml                 |  2 +-
 .../android/choreoplayer/app2/MainActivity.kt       | 13 +++++++------
 .../choreoplayer/app2/ui/gallery/GalleryFragment.kt |  2 +-
 .../choreoplayer/app2/ui/home/HomeFragment.kt       |  2 +-
 .../app2/ui/slideshow/SlideshowFragment.kt          |  2 +-
 lib-ui/src/main/res/layout/content_main.xml         |  2 +-
 11 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 .idea/.name

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..b6d1e7c
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+App2
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 88ea3aa..43fd926 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,6 +3,9 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..b6ea2b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/lib-resources/src/main/AndroidManifest.xml b/lib-resources/src/main/AndroidManifest.xml
index 57caf59..5a3b2ef 100644
--- a/lib-resources/src/main/AndroidManifest.xml
+++ b/lib-resources/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aeyeonmovement.android.choreoplayer.app2">
+    package="com.aeyeonmovement.android.choreoplayer.resources">
 </manifest>
diff --git a/lib-ui/build.gradle b/lib-ui/build.gradle
index 6117a0f..353d7c6 100644
--- a/lib-ui/build.gradle
+++ b/lib-ui/build.gradle
@@ -40,6 +40,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.drawerlayout:drawerlayout:1.0.0"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
diff --git a/lib-ui/src/main/AndroidManifest.xml b/lib-ui/src/main/AndroidManifest.xml
index 57caf59..f29bd15 100644
--- a/lib-ui/src/main/AndroidManifest.xml
+++ b/lib-ui/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aeyeonmovement.android.choreoplayer.app2">
+    package="com.aeyeonmovement.android.choreoplayer.ui">
 </manifest>
diff --git a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/MainActivity.kt b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/MainActivity.kt
index 3aaed8e..efaa55d 100644
--- a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/MainActivity.kt
+++ b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/MainActivity.kt
@@ -2,17 +2,18 @@ package com.aeyeonmovement.android.choreoplayer.app2
 
 import android.os.Bundle
 import android.view.Menu
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.navigation.NavigationView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
+import com.aeyeonmovement.android.choreoplayer.ui.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.navigation.NavigationView
+import com.google.android.material.snackbar.Snackbar
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/gallery/GalleryFragment.kt b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/gallery/GalleryFragment.kt
index 973dac2..4c19416 100644
--- a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/gallery/GalleryFragment.kt
+++ b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/gallery/GalleryFragment.kt
@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 
-import com.aeyeonmovement.android.choreoplayer.app2.R
+import com.aeyeonmovement.android.choreoplayer.ui.R
 
 class GalleryFragment : Fragment() {
 
diff --git a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/home/HomeFragment.kt b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/home/HomeFragment.kt
index 990a134..d767cf6 100644
--- a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/home/HomeFragment.kt
+++ b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/home/HomeFragment.kt
@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 
-import com.aeyeonmovement.android.choreoplayer.app2.R
+import com.aeyeonmovement.android.choreoplayer.ui.R
 
 class HomeFragment : Fragment() {
 
diff --git a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/slideshow/SlideshowFragment.kt b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/slideshow/SlideshowFragment.kt
index b816503..980b2af 100644
--- a/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/slideshow/SlideshowFragment.kt
+++ b/lib-ui/src/main/java/com/aeyeonmovement/android/choreoplayer/app2/ui/slideshow/SlideshowFragment.kt
@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 
-import com.aeyeonmovement.android.choreoplayer.app2.R
+import com.aeyeonmovement.android.choreoplayer.ui.R
 
 class SlideshowFragment : Fragment() {
 
diff --git a/lib-ui/src/main/res/layout/content_main.xml b/lib-ui/src/main/res/layout/content_main.xml
index 04b67fd..118d8d5 100644
--- a/lib-ui/src/main/res/layout/content_main.xml
+++ b/lib-ui/src/main/res/layout/content_main.xml
@@ -7,7 +7,7 @@
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/app_bar_main">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"