Skip to content

Commit 5be8350

Browse files
committed
Rx SearchView
#11 - remove demo RX searchview - i have used demo in AbsServerAsActoivity.java
1 parent 4202b3f commit 5be8350

File tree

7 files changed

+13
-20
lines changed

7 files changed

+13
-20
lines changed

app/src/main/java/com/eusecom/attendance/AbsServerAsActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public void accept(List<Attendance> result) {
8686
}
8787
});
8888

89-
getAbsServer("");
89+
String getfromfir = SettingsActivity.getFir(AbsServerAsActivity.this);
90+
getAbsServer(getfromfir);
9091

9192
}//end onstart
9293

@@ -185,9 +186,9 @@ public boolean test(String query) throws Exception {
185186
}).debounce(1000, TimeUnit.MILLISECONDS); // add this line
186187
}
187188

188-
private void getAbsServer(String username) {
189+
private void getAbsServer(String fromfir) {
189190
subscription = AbsServerClient.getInstance()
190-
.getAbsServer(username)
191+
.getAbsServer(fromfir)
191192
.subscribeOn(rx.schedulers.Schedulers.io())
192193
.observeOn(rx.android.schedulers.AndroidSchedulers.mainThread())
193194
.subscribe(new rx.Observer<List<Attendance>>() {

app/src/main/java/com/eusecom/attendance/AbsServerAsAdapter.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,13 @@ public void onBindViewHolder(AbsServerAsViewHolder holder, int position) {
9292
Picasso.with(holder.mContext).load(R.drawable.ic_remove_circle_black_24dp).resize(120, 120).into(holder.starView);
9393
}
9494

95-
//convert unix epoch timestamp (seconds) to milliseconds
96-
long timestampod = Long.parseLong(mListabsserver.get(position).daod) * 1000L;
97-
holder.datefrom.setText(getDate(timestampod ));
95+
holder.datefrom.setText(mListabsserver.get(position).daod);
9896

99-
long timestampdo = Long.parseLong(mListabsserver.get(position).dado) * 1000L;
100-
holder.dateto.setText(getDate(timestampdo ));
97+
holder.dateto.setText(mListabsserver.get(position).dado);
10198

102-
long timestamp = Long.parseLong(mListabsserver.get(position).daod) * 1000L;
10399
holder.hodxb.setText(mListabsserver.get(position).hodxb);
104100

105-
long timestampm = Long.parseLong(mListabsserver.get(position).daod) * 1000L;
106-
holder.datm.setText(holder.usemail + " " + getDateTime(timestampm ));
101+
holder.datm.setText(holder.usemail + " " + mListabsserver.get(position).datm);
107102

108103

109104

app/src/main/java/com/eusecom/attendance/MainDrawerAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,16 @@ public void onClick(View v, int pos, boolean isLongClick) {
221221
case 6:
222222

223223
// View v at position pos is clicked.
224-
Intent i6 = new Intent(mContext, CheeseActivity.class);
224+
Intent i6 = new Intent(mContext, MvpActivity.class);
225225
v.getContext().startActivity(i6);
226226

227227
break;
228228

229229
case 7:
230230

231231
// View v at position pos is clicked.
232-
Intent i7 = new Intent(mContext, MvpActivity.class);
233-
v.getContext().startActivity(i7);
232+
//Intent i7 = new Intent(mContext, CheeseActivity.class);
233+
//v.getContext().startActivity(i7);
234234

235235
break;
236236

app/src/main/java/com/eusecom/attendance/NewAbsenceActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ private void writeAbsence(String usico, String usid, String ume, String dmxa, St
416416
public class FirebaseRxSendMessaging {
417417

418418
String to, title, body;
419-
private GitHubRepoAdapter adapter = new GitHubRepoAdapter();
420419
private Subscription subscription;
421420

422421

app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import com.eusecom.attendance.Constants;
2525
import com.eusecom.attendance.FbmessClient;
26-
import com.eusecom.attendance.GitHubRepoAdapter;
2726
import com.eusecom.attendance.SettingsActivity;
2827
import com.eusecom.attendance.models.Attendance;
2928
import com.eusecom.attendance.models.MessData;
@@ -517,7 +516,6 @@ public class FirebaseRxApproveMessaging {
517516

518517
String to, title, body;
519518
int anodaj;
520-
private GitHubRepoAdapter adapter = new GitHubRepoAdapter();
521519
private Subscription subscription;
522520

523521

app/src/main/java/com/eusecom/attendance/retrofit/AbsServerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public interface AbsServerService {
1212

1313
@GET("/attendance/absserver.php")
14-
Observable<List<Attendance>> getAbsServer(@Query("user") String userName);
14+
Observable<List<Attendance>> getAbsServer(@Query("fromfir") String fromfir);
1515

1616
@GET("/attendance/absserver.json")
1717
Observable<List<Attendance>> getAbsServerFromJson(@Query("user") String userName);

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@
121121
<item >Google Maps</item>
122122
<item >Settings</item>
123123
<item >Demo Rx Bus</item>
124-
<item >Demo Rx Search debounced</item>
125-
<item >MvpActivity</item>
124+
<item >Demo Rx MvpActivity</item>
125+
<item >Free </item>
126126
</string-array>
127127

128128
<string name="app_name1">Slider Menu 1</string>

0 commit comments

Comments
 (0)