Skip to content

Commit bdc76c6

Browse files
FilipKesteliFilipKesteli
committed
9.0-Spojen RecyclerView i Firebase
1 parent cd3930b commit bdc76c6

26 files changed

+244
-169
lines changed

‎app/src/main/java/com/kesteli/filip/ubuntus2/clanovi/statusi/adapters/FavoritiAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public class MyViewHolder extends RecyclerView.ViewHolder {
6767

6868
public MyViewHolder(View view) {
6969
super(view);
70-
title = (TextView) view.findViewById(R.id.title);
71-
count = (TextView) view.findViewById(R.id.count);
70+
title = (TextView) view.findViewById(R.id.tvIme);
71+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
7272
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
73-
overflow = (ImageView) view.findViewById(R.id.overflow);
73+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
7474
}
7575
}
7676

@@ -82,10 +82,10 @@ public MyMenuItemClickListener() {
8282
@Override
8383
public boolean onMenuItemClick(MenuItem menuItem) {
8484
switch (menuItem.getItemId()) {
85-
case R.id.action_dodaj_u_favorite:
85+
case R.id.action_sklopi_ugovor:
8686
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
8787
return true;
88-
case R.id.action_nova_ponuda:
88+
case R.id.action_posalji_mail:
8989
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
9090
return true;
9191
default:

‎app/src/main/java/com/kesteli/filip/ubuntus2/clanovi/statusi/adapters/PonudeAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public class MyViewHolder extends RecyclerView.ViewHolder {
6767

6868
public MyViewHolder(View view) {
6969
super(view);
70-
title = (TextView) view.findViewById(R.id.title);
71-
count = (TextView) view.findViewById(R.id.count);
70+
title = (TextView) view.findViewById(R.id.tvIme);
71+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
7272
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
73-
overflow = (ImageView) view.findViewById(R.id.overflow);
73+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
7474
}
7575

7676
}
@@ -83,10 +83,10 @@ public MyMenuItemClickListener() {
8383
@Override
8484
public boolean onMenuItemClick(MenuItem menuItem) {
8585
switch (menuItem.getItemId()) {
86-
case R.id.action_dodaj_u_favorite:
86+
case R.id.action_sklopi_ugovor:
8787
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
8888
return true;
89-
case R.id.action_nova_ponuda:
89+
case R.id.action_posalji_mail:
9090
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
9191
return true;
9292
default:

‎app/src/main/java/com/kesteli/filip/ubuntus2/clanovi/statusi/adapters/PotraznjeAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public class MyViewHolder extends RecyclerView.ViewHolder {
6767

6868
public MyViewHolder(View view) {
6969
super(view);
70-
title = (TextView) view.findViewById(R.id.title);
71-
count = (TextView) view.findViewById(R.id.count);
70+
title = (TextView) view.findViewById(R.id.tvIme);
71+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
7272
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
73-
overflow = (ImageView) view.findViewById(R.id.overflow);
73+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
7474
}
7575

7676
}
@@ -83,10 +83,10 @@ public MyMenuItemClickListener() {
8383
@Override
8484
public boolean onMenuItemClick(MenuItem menuItem) {
8585
switch (menuItem.getItemId()) {
86-
case R.id.action_dodaj_u_favorite:
86+
case R.id.action_sklopi_ugovor:
8787
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
8888
return true;
89-
case R.id.action_nova_ponuda:
89+
case R.id.action_posalji_mail:
9090
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
9191
return true;
9292
default:

‎app/src/main/java/com/kesteli/filip/ubuntus2/clanovi/statusi/adapters/PovijestAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public class MyViewHolder extends RecyclerView.ViewHolder {
6767

6868
public MyViewHolder(View view) {
6969
super(view);
70-
title = (TextView) view.findViewById(R.id.title);
71-
count = (TextView) view.findViewById(R.id.count);
70+
title = (TextView) view.findViewById(R.id.tvIme);
71+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
7272
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
73-
overflow = (ImageView) view.findViewById(R.id.overflow);
73+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
7474
}
7575

7676
}
@@ -83,10 +83,10 @@ public MyMenuItemClickListener() {
8383
@Override
8484
public boolean onMenuItemClick(MenuItem menuItem) {
8585
switch (menuItem.getItemId()) {
86-
case R.id.action_dodaj_u_favorite:
86+
case R.id.action_sklopi_ugovor:
8787
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
8888
return true;
89-
case R.id.action_nova_ponuda:
89+
case R.id.action_posalji_mail:
9090
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
9191
return true;
9292
default:

‎app/src/main/java/com/kesteli/filip/ubuntus2/clanovi/statusi/adapters/PrihvacenoAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public class MyViewHolder extends RecyclerView.ViewHolder {
6767

6868
public MyViewHolder(View view) {
6969
super(view);
70-
title = (TextView) view.findViewById(R.id.title);
71-
count = (TextView) view.findViewById(R.id.count);
70+
title = (TextView) view.findViewById(R.id.tvIme);
71+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
7272
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
73-
overflow = (ImageView) view.findViewById(R.id.overflow);
73+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
7474
}
7575

7676
}
@@ -83,10 +83,10 @@ public MyMenuItemClickListener() {
8383
@Override
8484
public boolean onMenuItemClick(MenuItem menuItem) {
8585
switch (menuItem.getItemId()) {
86-
case R.id.action_dodaj_u_favorite:
86+
case R.id.action_sklopi_ugovor:
8787
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
8888
return true;
89-
case R.id.action_nova_ponuda:
89+
case R.id.action_posalji_mail:
9090
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
9191
return true;
9292
default:

‎app/src/main/java/com/kesteli/filip/ubuntus2/login/SignUpActivity.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.support.v7.app.AppCompatActivity;
88
import android.os.Bundle;
99
import android.text.TextUtils;
10+
import android.util.Log;
1011
import android.view.View;
1112
import android.widget.AdapterView;
1213
import android.widget.ArrayAdapter;
@@ -113,8 +114,6 @@ public void onClick(View v) {
113114
String email = etInputEmail.getText().toString().trim();
114115
String password = etInputPassword.getText().toString().trim();
115116

116-
// addToFirebase();
117-
118117
if (TextUtils.isEmpty(email)) {
119118
Toast.makeText(getApplicationContext(), "Enter email address!", Toast.LENGTH_SHORT).show();
120119
return;
@@ -197,6 +196,9 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
197196
Toast.makeText(parent.getContext(), "Selected: " + item, Toast.LENGTH_LONG).show();
198197
}
199198

199+
/**
200+
* Takoder spinner metoda
201+
*/
200202
@Override
201203
public void onNothingSelected(AdapterView<?> parent) {
202204

@@ -209,3 +211,4 @@ public void onNothingSelected(AdapterView<?> parent) {
209211

210212

211213

214+

‎app/src/main/java/com/kesteli/filip/ubuntus2/pocetna_stranica/FavoritiFragment.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ public MyMenuItemClickListener() {
213213
@Override
214214
public boolean onMenuItemClick(MenuItem menuItem) {
215215
switch (menuItem.getItemId()) {
216-
case R.id.action_dodaj_u_favorite:
216+
case R.id.action_sklopi_ugovor:
217217
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
218218
return true;
219-
case R.id.action_nova_ponuda:
219+
case R.id.action_posalji_mail:
220220
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
221221
return true;
222222
default:
@@ -232,10 +232,10 @@ public class ViewHolder extends RecyclerView.ViewHolder {
232232

233233
public ViewHolder(View view) {
234234
super(view);
235-
title = (TextView) view.findViewById(R.id.title);
236-
count = (TextView) view.findViewById(R.id.count);
235+
title = (TextView) view.findViewById(R.id.tvIme);
236+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
237237
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
238-
overflow = (ImageView) view.findViewById(R.id.overflow);
238+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
239239
}
240240
}
241241
}
@@ -250,3 +250,5 @@ public ViewHolder(View view) {
250250

251251

252252

253+
254+

‎app/src/main/java/com/kesteli/filip/ubuntus2/pocetna_stranica/PonudeFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ public MyMenuItemClickListener() {
216216
@Override
217217
public boolean onMenuItemClick(MenuItem menuItem) {
218218
switch (menuItem.getItemId()) {
219-
case R.id.action_dodaj_u_favorite:
219+
case R.id.action_sklopi_ugovor:
220220
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
221221
return true;
222-
case R.id.action_nova_ponuda:
222+
case R.id.action_posalji_mail:
223223
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
224224
return true;
225225
default:
@@ -235,10 +235,10 @@ public class ViewHolder extends RecyclerView.ViewHolder {
235235

236236
public ViewHolder(View view) {
237237
super(view);
238-
title = (TextView) view.findViewById(R.id.title);
239-
count = (TextView) view.findViewById(R.id.count);
238+
title = (TextView) view.findViewById(R.id.tvIme);
239+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
240240
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
241-
overflow = (ImageView) view.findViewById(R.id.overflow);
241+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
242242
}
243243
}
244244
}

‎app/src/main/java/com/kesteli/filip/ubuntus2/pocetna_stranica/PotraznjeFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ public MyMenuItemClickListener() {
215215
@Override
216216
public boolean onMenuItemClick(MenuItem menuItem) {
217217
switch (menuItem.getItemId()) {
218-
case R.id.action_dodaj_u_favorite:
218+
case R.id.action_sklopi_ugovor:
219219
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
220220
return true;
221-
case R.id.action_nova_ponuda:
221+
case R.id.action_posalji_mail:
222222
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
223223
return true;
224224
default:
@@ -234,10 +234,10 @@ public class ViewHolder extends RecyclerView.ViewHolder {
234234

235235
public ViewHolder(View view) {
236236
super(view);
237-
title = (TextView) view.findViewById(R.id.title);
238-
count = (TextView) view.findViewById(R.id.count);
237+
title = (TextView) view.findViewById(R.id.tvIme);
238+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
239239
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
240-
overflow = (ImageView) view.findViewById(R.id.overflow);
240+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
241241
}
242242
}
243243
}

‎app/src/main/java/com/kesteli/filip/ubuntus2/pocetna_stranica/PovijestFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ public MyMenuItemClickListener() {
216216
@Override
217217
public boolean onMenuItemClick(MenuItem menuItem) {
218218
switch (menuItem.getItemId()) {
219-
case R.id.action_dodaj_u_favorite:
219+
case R.id.action_sklopi_ugovor:
220220
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
221221
return true;
222-
case R.id.action_nova_ponuda:
222+
case R.id.action_posalji_mail:
223223
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
224224
return true;
225225
default:
@@ -235,10 +235,10 @@ public class ViewHolder extends RecyclerView.ViewHolder {
235235

236236
public ViewHolder(View view) {
237237
super(view);
238-
title = (TextView) view.findViewById(R.id.title);
239-
count = (TextView) view.findViewById(R.id.count);
238+
title = (TextView) view.findViewById(R.id.tvIme);
239+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
240240
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
241-
overflow = (ImageView) view.findViewById(R.id.overflow);
241+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
242242
}
243243
}
244244
}

‎app/src/main/java/com/kesteli/filip/ubuntus2/pocetna_stranica/PrihvacenoFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ public MyMenuItemClickListener() {
215215
@Override
216216
public boolean onMenuItemClick(MenuItem menuItem) {
217217
switch (menuItem.getItemId()) {
218-
case R.id.action_dodaj_u_favorite:
218+
case R.id.action_sklopi_ugovor:
219219
Toast.makeText(mContext, "Add to favourite", Toast.LENGTH_SHORT).show();
220220
return true;
221-
case R.id.action_nova_ponuda:
221+
case R.id.action_posalji_mail:
222222
Toast.makeText(mContext, "Play next", Toast.LENGTH_SHORT).show();
223223
return true;
224224
default:
@@ -234,10 +234,10 @@ public class ViewHolder extends RecyclerView.ViewHolder {
234234

235235
public ViewHolder(View view) {
236236
super(view);
237-
title = (TextView) view.findViewById(R.id.title);
238-
count = (TextView) view.findViewById(R.id.count);
237+
title = (TextView) view.findViewById(R.id.tvIme);
238+
count = (TextView) view.findViewById(R.id.tvBrojUspjesnihTransakcija);
239239
thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
240-
overflow = (ImageView) view.findViewById(R.id.overflow);
240+
overflow = (ImageView) view.findViewById(R.id.ivUgovor);
241241
}
242242
}
243243
}

‎app/src/main/java/com/kesteli/filip/ubuntus2/pocetna_stranica/UbuntusFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ private void setupSharedPreferences() {
7979
sharedPreferences = getActivity().getSharedPreferences(POJOLogin.KEY_MOJ_LOGIN_SHARED_PREFERENCES, Context.MODE_PRIVATE);
8080
}
8181

82+
//TODO: Mozda staviti kakav boolean flag!
8283
private void addToFirebase() {
8384
if (user != null) {
8485
String idClan2 = user.getUid();

‎app/src/main/java/com/kesteli/filip/ubuntus2/ugovor/UgovorRecyclerGridFragment.java

+27
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
import android.view.LayoutInflater;
2626
import android.view.View;
2727
import android.view.ViewGroup;
28+
import android.widget.FrameLayout;
29+
import android.widget.ImageView;
30+
import android.widget.TextView;
2831

2932
import com.kesteli.filip.ubuntus2.R;
3033
import com.kesteli.filip.ubuntus2.ugovor.helper.OnStartDragListener;
@@ -35,6 +38,9 @@
3538
*/
3639
public class UgovorRecyclerGridFragment extends Fragment implements OnStartDragListener {
3740

41+
private ImageView ivDetaljiPosla;
42+
private FrameLayout flItem;
43+
private TextView tvNazivPosla;
3844
private ItemTouchHelper mItemTouchHelper;
3945

4046
public UgovorRecyclerGridFragment() {
@@ -50,6 +56,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
5056
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
5157
super.onViewCreated(view, savedInstanceState);
5258

59+
setupRecyclerView(view);
60+
initViews(view);
61+
setupListeners();
62+
}
63+
64+
private void setupRecyclerView(View view) {
5365
final UgovorRecyclerListAdapter adapter = new UgovorRecyclerListAdapter(getActivity(), this);
5466

5567
RecyclerView recyclerView = (RecyclerView) view;
@@ -65,8 +77,23 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
6577
mItemTouchHelper.attachToRecyclerView(recyclerView);
6678
}
6779

80+
private void initViews(View view) {
81+
ivDetaljiPosla = (ImageView) view.findViewById(R.id.ivDetaljiPosla);
82+
tvNazivPosla = (TextView) view.findViewById(R.id.title);
83+
flItem = (FrameLayout) view.findViewById(R.id.flItem);
84+
}
85+
86+
private void setupListeners() {
87+
88+
}
89+
6890
@Override
6991
public void onStartDrag(RecyclerView.ViewHolder viewHolder) {
7092
mItemTouchHelper.startDrag(viewHolder);
7193
}
7294
}
95+
96+
97+
98+
99+

‎app/src/main/java/com/kesteli/filip/ubuntus2/ugovor/UgovorRecyclerListAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ public static class ItemViewHolder extends RecyclerView.ViewHolder implements
108108

109109
public ItemViewHolder(View itemView) {
110110
super(itemView);
111-
textView = (TextView) itemView.findViewById(R.id.text);
112-
handleView = (ImageView) itemView.findViewById(R.id.handle);
111+
textView = (TextView) itemView.findViewById(R.id.title);
112+
handleView = (ImageView) itemView.findViewById(R.id.ivDetaljiPosla);
113113
}
114114

115115
@Override

0 commit comments

Comments
 (0)