Skip to content

Commit 82d8540

Browse files
jorge-sanzjorge-sanz
committed
refactor: Apply recommended app architecture (#2)
https://developer.android.com/topic/libraries/architecture/guide.html#recommended_app_architecture
1 parent 7e04c6c commit 82d8540

12 files changed

Lines changed: 26 additions & 25 deletions

File tree

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Bizzy Cards for Android

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12-
<activity android:name=".MainActivity">
12+
<activity android:name=".ui.activities.MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515

app/src/main/java/com/aros/naufal/qrreader/CardRepository.java renamed to app/src/main/java/com/aros/naufal/qrreader/data/CardRepository.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.aros.naufal.qrreader;
1+
package com.aros.naufal.qrreader.data;
22

33
import android.app.Application;
44
import android.arch.lifecycle.LiveData;
55
import android.os.AsyncTask;
66

7-
import com.aros.naufal.qrreader.db.CardRoomDatabase;
8-
import com.aros.naufal.qrreader.db.dao.CardDao;
9-
import com.aros.naufal.qrreader.db.entity.Card;
7+
import com.aros.naufal.qrreader.data.database.CardRoomDatabase;
8+
import com.aros.naufal.qrreader.data.database.daos.CardDao;
9+
import com.aros.naufal.qrreader.data.database.entities.Card;
1010

1111
import java.util.List;
1212

app/src/main/java/com/aros/naufal/qrreader/db/CardRoomDatabase.java renamed to app/src/main/java/com/aros/naufal/qrreader/data/database/CardRoomDatabase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.aros.naufal.qrreader.db;
1+
package com.aros.naufal.qrreader.data.database;
22

33
import android.arch.persistence.db.SupportSQLiteDatabase;
44
import android.arch.persistence.room.Database;
@@ -9,8 +9,8 @@
99
import android.support.annotation.NonNull;
1010
import android.util.Log;
1111

12-
import com.aros.naufal.qrreader.db.dao.CardDao;
13-
import com.aros.naufal.qrreader.db.entity.Card;
12+
import com.aros.naufal.qrreader.data.database.daos.CardDao;
13+
import com.aros.naufal.qrreader.data.database.entities.Card;
1414

1515
@Database(entities = {Card.class}, version = 1)
1616
public abstract class CardRoomDatabase extends RoomDatabase {

app/src/main/java/com/aros/naufal/qrreader/db/dao/CardDao.java renamed to app/src/main/java/com/aros/naufal/qrreader/data/database/daos/CardDao.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.aros.naufal.qrreader.db.dao;
1+
package com.aros.naufal.qrreader.data.database.daos;
22

33
import android.arch.lifecycle.LiveData;
44
import android.arch.persistence.room.Dao;
55
import android.arch.persistence.room.Insert;
66
import android.arch.persistence.room.Query;
77

8-
import com.aros.naufal.qrreader.db.entity.Card;
8+
import com.aros.naufal.qrreader.data.database.entities.Card;
99

1010
import java.util.List;
1111

app/src/main/java/com/aros/naufal/qrreader/db/entity/Card.java renamed to app/src/main/java/com/aros/naufal/qrreader/data/database/entities/Card.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.aros.naufal.qrreader.db.entity;
1+
package com.aros.naufal.qrreader.data.database.entities;
22

33
import android.arch.persistence.room.ColumnInfo;
44
import android.arch.persistence.room.Entity;

app/src/main/java/com/aros/naufal/qrreader/MainActivity.java renamed to app/src/main/java/com/aros/naufal/qrreader/ui/activities/MainActivity.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.aros.naufal.qrreader;
1+
package com.aros.naufal.qrreader.ui.activities;
22

33
import android.arch.lifecycle.Observer;
4-
import android.arch.lifecycle.ViewModelProvider;
54
import android.arch.lifecycle.ViewModelProviders;
65
import android.content.DialogInterface;
76
import android.support.annotation.Nullable;
@@ -15,8 +14,9 @@
1514
import android.view.MenuItem;
1615
import android.widget.Toast;
1716

18-
import com.aros.naufal.qrreader.db.entity.Card;
19-
import com.aros.naufal.qrreader.ui.CardListAdapter;
17+
import com.aros.naufal.qrreader.R;
18+
import com.aros.naufal.qrreader.data.database.entities.Card;
19+
import com.aros.naufal.qrreader.ui.adapters.CardListAdapter;
2020
import com.aros.naufal.qrreader.viewmodel.CardViewModel;
2121
import com.google.zxing.Result;
2222

@@ -96,7 +96,7 @@ protected void onPause() {
9696
}
9797

9898
@Override
99-
public void handleResult(Result result) {
99+
public void handleResult(final Result result) {
100100
// Do something with the result here
101101
System.out.println("RESULT ==>> " + result.getText());
102102
Log.d("handler", result.getText()); // Prints scan results
@@ -107,6 +107,7 @@ public void handleResult(Result result) {
107107
builder.setNeutralButton("Añadir contacto", new DialogInterface.OnClickListener() {
108108
@Override
109109
public void onClick(DialogInterface dialog, int which) {
110+
mCardViewModel.instert(new Card(result.getText()));
110111
Toast.makeText(MainActivity.this, "Confirmado", Toast.LENGTH_LONG).show();
111112
}
112113
});

app/src/main/java/com/aros/naufal/qrreader/ui/CardListAdapter.java renamed to app/src/main/java/com/aros/naufal/qrreader/ui/adapters/CardListAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.aros.naufal.qrreader.ui;
1+
package com.aros.naufal.qrreader.ui.adapters;
22

33
import android.content.Context;
44
import android.support.v7.widget.RecyclerView;
@@ -9,7 +9,7 @@
99

1010
import com.aros.naufal.qrreader.R;
1111

12-
import com.aros.naufal.qrreader.db.entity.Card;
12+
import com.aros.naufal.qrreader.data.database.entities.Card;
1313

1414
import java.util.List;
1515

‎app/src/main/java/com/aros/naufal/qrreader/viewmodel/CardViewModel.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import android.app.Application;
44
import android.arch.lifecycle.AndroidViewModel;
55
import android.arch.lifecycle.LiveData;
6-
import android.support.annotation.NonNull;
76

8-
import com.aros.naufal.qrreader.CardRepository;
9-
import com.aros.naufal.qrreader.db.entity.Card;
7+
import com.aros.naufal.qrreader.data.CardRepository;
8+
import com.aros.naufal.qrreader.data.database.entities.Card;
109

1110
import java.util.List;
1211

0 commit comments

Comments
 (0)