增加app在内外显示,支持长按显示隐藏,优化命名,主页app显示还有问题
This commit is contained in:
1 parent
552ec8dbe9
commit
8dc284c2f3
38 files changed
+1265
-290
No files matched your search
@@ -9,7 +9,7 @@ import com.trello.rxlifecycle4.RxLifecycle;
|
||||
import com.trello.rxlifecycle4.android.ActivityEvent;
|
||||
import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.databinding.ActivityContactAddBinding;
|
||||
import com.ttstd.dialer.db.contact.Contact;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.db.contact.ContactRepository;
|
||||
|
||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
|
||||
@@ -38,9 +38,9 @@ public class ContactAddViewModel extends BaseViewModel<ActivityContactAddBinding
|
||||
@Override
|
||||
public void subscribe(@NonNull ObservableEmitter<Long> emitter) throws Throwable {
|
||||
int count = mRepository.getTotalCount() + 1;
|
||||
Contact contact = new Contact(name, phone, count);
|
||||
Log.e(TAG, "saveContact: " + contact);
|
||||
emitter.onNext(mRepository.insert(contact));
|
||||
ContactInfo contactInfo = new ContactInfo(name, phone, count);
|
||||
Log.e(TAG, "saveContact: " + contactInfo);
|
||||
emitter.onNext(mRepository.insert(contactInfo));
|
||||
emitter.onComplete();
|
||||
}
|
||||
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
package com.ttstd.dialer.activity.contact.list;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.Uri;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
@@ -18,7 +15,7 @@ import com.ttstd.dialer.activity.contact.add.ContactAddActivity;
|
||||
import com.ttstd.dialer.adapter.ContactInfoAdapter;
|
||||
import com.ttstd.dialer.base.mvvm.BaseMvvmActivity;
|
||||
import com.ttstd.dialer.databinding.ActivityContactListBinding;
|
||||
import com.ttstd.dialer.db.contact.Contact;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.fragment.dialog.call.CallFragment;
|
||||
import com.ttstd.dialer.view.ItemTouchHelperCallback;
|
||||
|
||||
@@ -31,7 +28,7 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
|
||||
private ContactInfoAdapter mContactInfoAdapter;
|
||||
|
||||
private List<Contact> mContacts;
|
||||
private List<ContactInfo> mContactInfos;
|
||||
|
||||
@Override
|
||||
public boolean setNightMode() {
|
||||
@@ -63,14 +60,14 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
@Override
|
||||
public void onItemMove(int fromPosition, int toPosition) {
|
||||
Log.e(TAG, "onItemMove: ");
|
||||
Contact fromContact = mContacts.get(fromPosition);
|
||||
int fromContactPosition = fromContact.getPosition();
|
||||
Contact toContact = mContacts.get(toPosition);
|
||||
int toContactPosition = toContact.getPosition();
|
||||
fromContact.setPosition(toContactPosition);
|
||||
mViewModel.updateItemPosition(fromContact);
|
||||
toContact.setPosition(fromContactPosition);
|
||||
mViewModel.updateItemPosition(toContact);
|
||||
ContactInfo fromContactInfo = mContactInfos.get(fromPosition);
|
||||
int fromContactPosition = fromContactInfo.getPosition();
|
||||
ContactInfo toContactInfo = mContactInfos.get(toPosition);
|
||||
int toContactPosition = toContactInfo.getPosition();
|
||||
fromContactInfo.setPosition(toContactPosition);
|
||||
mViewModel.updateItemPosition(fromContactInfo);
|
||||
toContactInfo.setPosition(fromContactPosition);
|
||||
mViewModel.updateItemPosition(toContactInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -81,8 +78,8 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
});
|
||||
mContactInfoAdapter.setOnClickListener(new ContactInfoAdapter.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(Contact contact) {
|
||||
new CallFragment(contact).show(getSupportFragmentManager(), "CallFragment");
|
||||
public void onClick(ContactInfo contactInfo) {
|
||||
new CallFragment(contactInfo).show(getSupportFragmentManager(), "CallFragment");
|
||||
}
|
||||
});
|
||||
// 设置ItemTouchHelper,实现拖动和滑动删除
|
||||
@@ -98,12 +95,12 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
|
||||
|
||||
@Override
|
||||
protected void initData() {
|
||||
mViewModel.mContactListData.observe(this, new Observer<List<Contact>>() {
|
||||
mViewModel.mContactListData.observe(this, new Observer<List<ContactInfo>>() {
|
||||
@Override
|
||||
public void onChanged(List<Contact> contacts) {
|
||||
Log.e(TAG, "mContactListData: " + contacts);
|
||||
mContacts = contacts;
|
||||
mContactInfoAdapter.setContacts(mContacts);
|
||||
public void onChanged(List<ContactInfo> contactInfos) {
|
||||
Log.e(TAG, "mContactListData: " + contactInfos);
|
||||
mContactInfos = contactInfos;
|
||||
mContactInfoAdapter.setContactInfos(mContactInfos);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+12
-12
@@ -9,7 +9,7 @@ import com.trello.rxlifecycle4.RxLifecycle;
|
||||
import com.trello.rxlifecycle4.android.ActivityEvent;
|
||||
import com.ttstd.dialer.base.mvvm.BaseViewModel;
|
||||
import com.ttstd.dialer.databinding.ActivityContactListBinding;
|
||||
import com.ttstd.dialer.db.contact.Contact;
|
||||
import com.ttstd.dialer.db.contact.ContactInfo;
|
||||
import com.ttstd.dialer.db.contact.ContactRepository;
|
||||
|
||||
import java.util.List;
|
||||
@@ -33,29 +33,29 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
|
||||
mRepository = new ContactRepository(context);
|
||||
}
|
||||
|
||||
public MutableLiveData<List<Contact>> mContactListData = new MutableLiveData<>();
|
||||
public MutableLiveData<List<ContactInfo>> mContactListData = new MutableLiveData<>();
|
||||
|
||||
public void getAllContacts() {
|
||||
Observable.create(new ObservableOnSubscribe<List<Contact>>() {
|
||||
Observable.create(new ObservableOnSubscribe<List<ContactInfo>>() {
|
||||
@Override
|
||||
public void subscribe(@NonNull ObservableEmitter<List<Contact>> emitter) throws Throwable {
|
||||
List<Contact> contacts = mRepository.getAllContacts();
|
||||
emitter.onNext(contacts);
|
||||
public void subscribe(@NonNull ObservableEmitter<List<ContactInfo>> emitter) throws Throwable {
|
||||
List<ContactInfo> contactInfos = mRepository.getAllContacts();
|
||||
emitter.onNext(contactInfos);
|
||||
emitter.onComplete();
|
||||
}
|
||||
}).compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Observer<List<Contact>>() {
|
||||
.subscribe(new Observer<List<ContactInfo>>() {
|
||||
@Override
|
||||
public void onSubscribe(@NonNull Disposable d) {
|
||||
Log.e("getAllContacts", "onSubscribe: ");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(@NonNull List<Contact> contacts) {
|
||||
public void onNext(@NonNull List<ContactInfo> contactInfos) {
|
||||
Log.e("getAllContacts", "onNext: ");
|
||||
mContactListData.setValue(contacts);
|
||||
mContactListData.setValue(contactInfos);
|
||||
|
||||
// List<Contact> sorted = contacts.stream().sorted(new Comparator<Contact>() {
|
||||
// @Override
|
||||
@@ -78,12 +78,12 @@ public class ContactListViewModel extends BaseViewModel<ActivityContactListBindi
|
||||
});
|
||||
}
|
||||
|
||||
public void updateItemPosition(Contact contact) {
|
||||
Log.e(TAG, "updateItemPosition: " + contact);
|
||||
public void updateItemPosition(ContactInfo contactInfo) {
|
||||
Log.e(TAG, "updateItemPosition: " + contactInfo);
|
||||
Observable.create(new ObservableOnSubscribe<Integer>() {
|
||||
@Override
|
||||
public void subscribe(@NonNull ObservableEmitter<Integer> emitter) throws Throwable {
|
||||
int id = mRepository.update(contact);
|
||||
int id = mRepository.update(contactInfo);
|
||||
emitter.onNext(id);
|
||||
emitter.onComplete();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user