Skip to content
This repository was archived by the owner on Aug 15, 2021. It is now read-only.

Commit aad0744

Browse files
fartemfartem
committed
2019-12-08 Version 2.1.0: Refactored project structure
1 parent 5a3f1fb commit aad0744

File tree

23 files changed

+94
-65
lines changed

23 files changed

+94
-65
lines changed

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
minSdkVersion 21
1111
targetSdkVersion 29
1212
versionCode 1
13-
versionName "2.0.0"
13+
versionName "2.1.0"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
}

‎app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/ui/note/NoteCreationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions
66
import androidx.test.espresso.matcher.ViewMatchers.withId
77
import androidx.test.espresso.matcher.ViewMatchers.withText
88
import com.smlnskgmail.jaman.randomnotes.R
9-
import com.smlnskgmail.jaman.randomnotes.components.noteslist.NotesHolder
9+
import com.smlnskgmail.jaman.randomnotes.logic.main.noteslist.NotesHolder
1010
import com.smlnskgmail.jaman.randomnotes.repository.DataRepositoryAccessor
1111
import com.smlnskgmail.jaman.randomnotes.ui.utils.ChildClick
1212
import org.junit.Assert.assertFalse

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/Application.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.smlnskgmail.jaman.randomnotes
22

33
import android.app.Application
4+
import com.smlnskgmail.jaman.randomnotes.logic.sources.ormlite.OrmLiteDataSource
5+
import com.smlnskgmail.jaman.randomnotes.logic.sources.parse.ParseDataSource
46
import com.smlnskgmail.jaman.randomnotes.repository.DataRepositoryAccessor
5-
import com.smlnskgmail.jaman.randomnotes.sources.ormlite.OrmLiteDataSource
6-
import com.smlnskgmail.jaman.randomnotes.sources.parse.ParseDataSource
77

88
@Suppress("unused")
99
class Application : Application() {

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/MainActivity.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import android.os.Bundle
44
import androidx.appcompat.app.AppCompatActivity
55
import androidx.fragment.app.Fragment
66
import androidx.fragment.app.FragmentManager
7-
import com.smlnskgmail.jaman.randomnotes.navigation.BaseFragment
8-
import com.smlnskgmail.jaman.randomnotes.navigation.FragmentResume
9-
import com.smlnskgmail.jaman.randomnotes.navigation.LoginFragment
10-
import com.smlnskgmail.jaman.randomnotes.navigation.MainFragment
7+
import com.smlnskgmail.jaman.randomnotes.components.BaseFragment
8+
import com.smlnskgmail.jaman.randomnotes.components.FragmentResume
9+
import com.smlnskgmail.jaman.randomnotes.logic.login.LoginFragment
10+
import com.smlnskgmail.jaman.randomnotes.logic.main.MainFragment
1111

1212
class MainActivity : AppCompatActivity() {
1313

@@ -39,7 +39,8 @@ class MainActivity : AppCompatActivity() {
3939

4040
private fun showMainFragment() {
4141
val mainFragment: MainFragment = (supportFragmentManager
42-
.findFragmentByTag(MainFragment::class.java.name) ?: MainFragment()) as MainFragment
42+
.findFragmentByTag(MainFragment::class.java.name)
43+
?: MainFragment()) as MainFragment
4344
showBaseFragment(mainFragment)
4445
}
4546

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/bottomsheets/BaseBottomSheet.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/BaseBottomSheet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.bottomsheets
1+
package com.smlnskgmail.jaman.randomnotes.components
22

33
import android.os.Bundle
44
import android.view.LayoutInflater

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/dialogs/BaseDialog.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/BaseDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.dialogs
1+
package com.smlnskgmail.jaman.randomnotes.components
22

33
import android.app.Dialog
44
import android.content.Context

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/navigation/BaseFragment.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/BaseFragment.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.navigation
1+
package com.smlnskgmail.jaman.randomnotes.components
22

33
import android.os.Bundle
44
import android.view.*
@@ -64,4 +64,10 @@ abstract class BaseFragment : Fragment(), FragmentResume {
6464

6565
}
6666

67+
}
68+
69+
interface FragmentResume {
70+
71+
fun onFragmentResume()
72+
6773
}

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/views/LongToast.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/LongToast.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.views
1+
package com.smlnskgmail.jaman.randomnotes.components
22

33
import android.content.Context
44
import android.widget.Toast

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/bottomsheets/addnote/AddNoteTarget.kt

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

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/dialogs/invite/InviteCallback.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/invite/InviteCallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.dialogs.invite
1+
package com.smlnskgmail.jaman.randomnotes.logic.invite
22

33
interface InviteCallback {
44

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/dialogs/invite/InviteDialog.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/invite/InviteDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.dialogs.invite
1+
package com.smlnskgmail.jaman.randomnotes.logic.invite
22

33
import android.content.Context
44
import com.parse.FunctionCallback
55
import com.parse.ParseCloud
66
import com.smlnskgmail.jaman.randomnotes.R
7-
import com.smlnskgmail.jaman.randomnotes.components.dialogs.BaseDialog
7+
import com.smlnskgmail.jaman.randomnotes.components.BaseDialog
88
import kotlinx.android.synthetic.main.dialog_invite.*
99

1010
class InviteDialog(context: Context) : BaseDialog(context) {

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/navigation/LoginFragment.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/login/LoginFragment.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package com.smlnskgmail.jaman.randomnotes.navigation
1+
package com.smlnskgmail.jaman.randomnotes.logic.login
22

33
import android.content.Intent
44
import com.smlnskgmail.jaman.randomnotes.MainActivity
55
import com.smlnskgmail.jaman.randomnotes.R
6-
import com.smlnskgmail.jaman.randomnotes.logger.L
6+
import com.smlnskgmail.jaman.randomnotes.components.BaseFragment
77
import com.smlnskgmail.jaman.randomnotes.repository.DataRepositoryAccessor
8+
import com.smlnskgmail.jaman.randomnotes.tools.L
89
import kotlinx.android.synthetic.main.fragment_login.*
910

1011
class LoginFragment : BaseFragment() {

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/navigation/MainFragment.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/main/MainFragment.kt

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package com.smlnskgmail.jaman.randomnotes.navigation
1+
package com.smlnskgmail.jaman.randomnotes.logic.main
22

33
import androidx.core.content.ContextCompat
44
import com.parse.ParseUser
55
import com.smlnskgmail.jaman.randomnotes.MainActivity
66
import com.smlnskgmail.jaman.randomnotes.R
7-
import com.smlnskgmail.jaman.randomnotes.components.bottomsheets.addnote.AddNoteBottomSheet
8-
import com.smlnskgmail.jaman.randomnotes.components.bottomsheets.addnote.AddNoteTarget
9-
import com.smlnskgmail.jaman.randomnotes.components.dialogs.invite.InviteCallback
10-
import com.smlnskgmail.jaman.randomnotes.components.dialogs.invite.InviteDialog
11-
import com.smlnskgmail.jaman.randomnotes.components.noteslist.NotesAdapter
12-
import com.smlnskgmail.jaman.randomnotes.components.views.LongToast
7+
import com.smlnskgmail.jaman.randomnotes.components.BaseFragment
8+
import com.smlnskgmail.jaman.randomnotes.components.LongToast
9+
import com.smlnskgmail.jaman.randomnotes.logic.invite.InviteCallback
10+
import com.smlnskgmail.jaman.randomnotes.logic.invite.InviteDialog
11+
import com.smlnskgmail.jaman.randomnotes.logic.main.noteslist.NotesAdapter
12+
import com.smlnskgmail.jaman.randomnotes.logic.notecreation.AddNoteBottomSheet
1313
import com.smlnskgmail.jaman.randomnotes.repository.DataRepositoryAccessor
1414
import com.smlnskgmail.jaman.randomnotes.repository.entities.Note
1515
import kotlinx.android.synthetic.main.fragment_main.*
1616

17-
class MainFragment : BaseFragment(), AddNoteTarget, InviteCallback {
17+
class MainFragment : BaseFragment(), AddNoteBottomSheet.AddNoteTarget, InviteCallback {
1818

1919
private val notes: MutableList<Note> = mutableListOf()
2020

@@ -43,15 +43,21 @@ class MainFragment : BaseFragment(), AddNoteTarget, InviteCallback {
4343
DataRepositoryAccessor.get().saveNotes(newNotes)
4444
refreshNotes()
4545
} else {
46-
LongToast(context!!, getString(R.string.error_cannot_restore_notes)).show()
46+
LongToast(
47+
context!!,
48+
getString(R.string.error_cannot_restore_notes)
49+
).show()
4750
}
4851
}
4952
}
5053
}
5154
sync_notes.setOnClickListener {
5255
actionWithNotes {
5356
DataRepositoryAccessor.get().syncNotes(notes) {
54-
LongToast(context!!, getString(R.string.error_cannot_sync_notes)).show()
57+
LongToast(
58+
context!!,
59+
getString(R.string.error_cannot_sync_notes)
60+
).show()
5561
}
5662
}
5763
}
@@ -63,13 +69,15 @@ class MainFragment : BaseFragment(), AddNoteTarget, InviteCallback {
6369
}
6470

6571
private fun share() {
66-
val inviteDialog = InviteDialog(context!!)
72+
val inviteDialog =
73+
InviteDialog(context!!)
6774
inviteDialog.setInviteCallback(this)
6875
inviteDialog.show()
6976
}
7077

7178
private fun addNote() {
72-
val addNoteBottomSheet = AddNoteBottomSheet()
79+
val addNoteBottomSheet =
80+
AddNoteBottomSheet()
7381
addNoteBottomSheet.addNoteCreationCallback(this)
7482
addNoteBottomSheet.show(activity!!.supportFragmentManager,
7583
addNoteBottomSheet.javaClass.name)
@@ -85,7 +93,10 @@ class MainFragment : BaseFragment(), AddNoteTarget, InviteCallback {
8593
if (ParseUser.getCurrentUser() != null) {
8694
action()
8795
} else {
88-
LongToast(context!!, getString(R.string.message_sign_in)).show()
96+
LongToast(
97+
context!!,
98+
getString(R.string.message_sign_in)
99+
).show()
89100
}
90101
}
91102
}
@@ -103,9 +114,15 @@ class MainFragment : BaseFragment(), AddNoteTarget, InviteCallback {
103114

104115
override fun onInviteAction(success: Boolean) {
105116
if (success) {
106-
LongToast(context!!, getString(R.string.message_invite_sent)).show()
117+
LongToast(
118+
context!!,
119+
getString(R.string.message_invite_sent)
120+
).show()
107121
} else {
108-
LongToast(context!!, getString(R.string.error_invite_sent)).show()
122+
LongToast(
123+
context!!,
124+
getString(R.string.error_invite_sent)
125+
).show()
109126
}
110127
}
111128

@@ -133,7 +150,9 @@ class MainFragment : BaseFragment(), AddNoteTarget, InviteCallback {
133150
} else {
134151
R.drawable.ic_login
135152
}
136-
getMenu().findItem(R.id.menu_login_action)!!.icon = ContextCompat.getDrawable(context!!, icon)
153+
getMenu().findItem(
154+
R.id.menu_login_action
155+
)!!.icon = ContextCompat.getDrawable(context!!, icon)
137156
}
138157

139158
override fun getTitleResId() = R.string.title_main_fragment

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/noteslist/NoteDeleteListener.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/main/noteslist/NoteDeleteListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.noteslist
1+
package com.smlnskgmail.jaman.randomnotes.logic.main.noteslist
22

33
interface NoteDeleteListener {
44

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/noteslist/NotesAdapter.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/main/noteslist/NotesAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.noteslist
1+
package com.smlnskgmail.jaman.randomnotes.logic.main.noteslist
22

33
import android.view.LayoutInflater
44
import android.view.ViewGroup

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/noteslist/NotesHolder.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/main/noteslist/NotesHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.noteslist
1+
package com.smlnskgmail.jaman.randomnotes.logic.main.noteslist
22

33
import android.view.View
44
import androidx.recyclerview.widget.RecyclerView

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/bottomsheets/addnote/AddNoteBottomSheet.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/notecreation/AddNoteBottomSheet.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.smlnskgmail.jaman.randomnotes.components.bottomsheets.addnote
1+
package com.smlnskgmail.jaman.randomnotes.logic.notecreation
22

33
import android.widget.EditText
44
import com.smlnskgmail.jaman.randomnotes.R
5-
import com.smlnskgmail.jaman.randomnotes.components.bottomsheets.BaseBottomSheet
5+
import com.smlnskgmail.jaman.randomnotes.components.BaseBottomSheet
66
import com.smlnskgmail.jaman.randomnotes.repository.DataRepositoryAccessor
77
import com.smlnskgmail.jaman.randomnotes.repository.entities.Note
88
import kotlinx.android.synthetic.main.bottom_sheet_add_note.*
@@ -35,4 +35,10 @@ class AddNoteBottomSheet : BaseBottomSheet() {
3535

3636
override fun getLayoutResId() = R.layout.bottom_sheet_add_note
3737

38+
interface AddNoteTarget {
39+
40+
fun newNoteAdded(note: Note)
41+
42+
}
43+
3844
}

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/sources/ormlite/OrmLiteDataSource.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/sources/ormlite/OrmLiteDataSource.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.sources.ormlite
1+
package com.smlnskgmail.jaman.randomnotes.logic.sources.ormlite
22

33
import android.content.Context
44
import android.database.sqlite.SQLiteDatabase
@@ -7,9 +7,9 @@ import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper
77
import com.j256.ormlite.support.ConnectionSource
88
import com.j256.ormlite.table.TableUtils
99
import com.smlnskgmail.jaman.randomnotes.R
10-
import com.smlnskgmail.jaman.randomnotes.logger.L
1110
import com.smlnskgmail.jaman.randomnotes.repository.entities.Note
1211
import com.smlnskgmail.jaman.randomnotes.repository.model.local.LocalDataSource
12+
import com.smlnskgmail.jaman.randomnotes.tools.L
1313
import java.sql.SQLException
1414

1515
private const val databaseFileName = "rn.db"

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/sources/ormlite/config/OrmLiteDatabaseConfigurator.java renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/sources/ormlite/config/OrmLiteDatabaseConfigurator.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.smlnskgmail.jaman.randomnotes.sources.ormlite.config;
1+
package com.smlnskgmail.jaman.randomnotes.logic.sources.ormlite.config;
22

33
import com.j256.ormlite.android.apptools.OrmLiteConfigUtil;
4-
import com.smlnskgmail.jaman.randomnotes.sources.ormlite.OrmLiteDataSource;
4+
import com.smlnskgmail.jaman.randomnotes.logic.sources.ormlite.OrmLiteDataSource;
55

66
import java.io.File;
77
import java.lang.reflect.Method;
@@ -13,13 +13,25 @@ public class OrmLiteDatabaseConfigurator {
1313

1414
public static void main(String[] args) throws Exception {
1515
// About: https://github.com/j256/ormlite-android/issues/79
16-
File file = new File("../../build/tmp/kotlin-classes/randomNotesDebug");
16+
File file = new File(
17+
"../../build/tmp/kotlin-classes/randomNotesDebug"
18+
);
1719
URL url = file.toURL();
1820
URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
1921
Class urlClass = URLClassLoader.class;
20-
Method method = urlClass.getDeclaredMethod("addURL", new Class[]{URL.class});
22+
Method method = urlClass.getDeclaredMethod(
23+
"addURL",
24+
new Class[]{
25+
URL.class
26+
}
27+
);
2128
method.setAccessible(true);
22-
method.invoke(urlClassLoader, new Object[]{url});
29+
method.invoke(
30+
urlClassLoader,
31+
new Object[]{
32+
url
33+
}
34+
);
2335

2436
OrmLiteConfigUtil.writeConfigFile(
2537
"db_config.txt",

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/sources/parse/ParseDataSource.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logic/sources/parse/ParseDataSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.sources.parse
1+
package com.smlnskgmail.jaman.randomnotes.logic.sources.parse
22

33
import android.content.Context
44
import android.content.Intent

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/navigation/FragmentResume.kt

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

‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/logger/L.kt renamed to ‎app/src/main/java/com/smlnskgmail/jaman/randomnotes/tools/L.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smlnskgmail.jaman.randomnotes.logger
1+
package com.smlnskgmail.jaman.randomnotes.tools
22

33
import android.util.Log
44

‎app/src/main/res/raw/db_config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# generated on 2019/12/04 08:10:45
2+
# generated on 2019/12/08 11:34:43
33
#
44
# --table-start--
55
dataClass=com.smlnskgmail.jaman.randomnotes.repository.entities.Note

0 commit comments

Comments
 (0)