Skip to content

Commit bc9128e

Browse files
authored
Merge pull request #2 from reduxkotlin/change-packages
rename store package to UI and other moves
2 parents 92a1995 + 5036fce commit bc9128e

19 files changed

+33
-328
lines changed

android/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<uses-permission android:name="android.permission.INTERNET"/>
66

77
<application
8-
android:name="org.reduxkotlin.readinglist.OpenLibraryApp"
8+
android:name="org.reduxkotlin.readinglist.ReadingListApp"
99
android:allowBackup="true"
1010
android:icon="@mipmap/ic_launcher"
1111
android:label="@string/app_name"
1212
android:roundIcon="@mipmap/ic_launcher_round"
1313
android:supportsRtl="true"
1414
android:theme="@style/LibraryAppTheme">
1515
<activity
16-
android:name="org.reduxkotlin.readinglist.MainActivity"
16+
android:name="org.reduxkotlin.readinglist.ui.MainActivity"
1717
android:label="@string/app_name"
1818
android:windowSoftInputMode="adjustPan"
1919
android:theme="@style/LibraryAppTheme">

android/src/main/java/org/reduxkotlin/readinglist/OpenLibraryApp.kt renamed to android/src/main/java/org/reduxkotlin/readinglist/ReadingListApp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.reduxkotlin.readinglist.common.repo.createDatabase
1313
import kotlinx.coroutines.Dispatchers
1414
import org.reduxkotlin.readinglist.common.LibraryDatabase
1515

16-
class OpenLibraryApp : Application() {
16+
class ReadingListApp : Application() {
1717

1818
lateinit var libraryApp: LibraryApp
1919

@@ -43,7 +43,7 @@ class OpenLibraryApp : Application() {
4343
}
4444

4545
companion object {
46-
lateinit var instance: OpenLibraryApp
46+
lateinit var instance: ReadingListApp
4747

4848
fun gameEngine() = instance.libraryApp
4949
val dispatch

android/src/main/java/org/reduxkotlin/readinglist/RoundedCornersTransformation.java

Lines changed: 0 additions & 281 deletions
This file was deleted.

android/src/main/java/org/reduxkotlin/readinglist/store/BaseLibraryViewFragment.kt renamed to android/src/main/java/org/reduxkotlin/readinglist/ui/BaseLibraryViewFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.reduxkotlin.readinglist.store
1+
package org.reduxkotlin.readinglist.ui
22

33
import android.os.Bundle
44
import androidx.fragment.app.Fragment

android/src/main/java/org/reduxkotlin/readinglist/store/BooksAdapter.kt renamed to android/src/main/java/org/reduxkotlin/readinglist/ui/BooksAdapter.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package org.reduxkotlin.readinglist.store
1+
package org.reduxkotlin.readinglist.ui
22

33
import android.view.LayoutInflater
44
import android.view.View
55
import android.view.ViewGroup
66
import androidx.recyclerview.widget.RecyclerView
7-
import org.reduxkotlin.readinglist.GlideApp
87
import org.reduxkotlin.readinglist.common.ui.BookListItemViewState
98
import org.reduxkotlin.readinglist.common.ui.ListHeader
109
import kotlinx.android.synthetic.main.item_book.view.*

android/src/main/java/org/reduxkotlin/readinglist/BottomNavigationDialogFragment.kt renamed to android/src/main/java/org/reduxkotlin/readinglist/ui/BottomNavigationDialogFragment.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.reduxkotlin.readinglist
1+
package org.reduxkotlin.readinglist.ui
22

33
import android.os.Bundle
44
import android.view.LayoutInflater
@@ -9,6 +9,7 @@ import org.reduxkotlin.readinglist.common.ui.BottomNavSheet
99
import org.reduxkotlin.readinglist.common.ui.UiActions
1010
import kotlinx.android.synthetic.main.fragment_bottomsheet.*
1111
import org.reduxkotlin.PresenterLifecycleObserver
12+
import org.reduxkotlin.readinglist.R
1213
import org.reduxkotlin.rootDispatch
1314

1415
class BottomNavigationDrawerFragment : BottomSheetDialogFragment(), BottomNavSheet {

android/src/main/java/org/reduxkotlin/readinglist/store/CompletedFragment.kt renamed to android/src/main/java/org/reduxkotlin/readinglist/ui/CompletedFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package org.reduxkotlin.readinglist.store
1+
package org.reduxkotlin.readinglist.ui
22

33
import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
77
import androidx.recyclerview.widget.LinearLayoutManager
8-
import org.reduxkotlin.readinglist.MainActivity
98
import org.reduxkotlin.readinglist.common.ui.UiActions
109
import org.reduxkotlin.readinglist.common.ui.CompletedView
1110
import kotlinx.android.synthetic.main.fragment_completed.*

android/src/main/java/org/reduxkotlin/readinglist/store/DetailsFragment.kt renamed to android/src/main/java/org/reduxkotlin/readinglist/ui/DetailsFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.reduxkotlin.readinglist.store
1+
package org.reduxkotlin.readinglist.ui
22

33
import android.os.Bundle
44
import android.view.*
55
import org.reduxkotlin.readinglist.*
6-
import org.reduxkotlin.readinglist.store.BaseLibraryViewFragment
76
import org.reduxkotlin.readinglist.common.ui.UiActions
87
import org.reduxkotlin.readinglist.common.ui.BookDetailViewState
98
import org.reduxkotlin.readinglist.common.ui.DetailsView
109
import kotlinx.android.synthetic.main.fragment_book_detail.*
10+
import org.reduxkotlin.readinglist.util.MenuTint
1111
import org.reduxkotlin.rootDispatch
1212

1313
class DetailsFragment : BaseLibraryViewFragment<DetailsView>(), DetailsView {

0 commit comments

Comments
 (0)