Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mathieu Féry
mobile21
Commits
9d1dd626
Commit
9d1dd626
authored
Apr 22, 2021
by
Mathilde Ballouhey
Browse files
maj: Affichage nom
parent
50367599
Pipeline
#28837
failed with stages
in 1 minute and 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/fr/iutnantes/miar/dndgenerator/DisplayResultActivity.java
View file @
9d1dd626
...
@@ -26,7 +26,7 @@ public class DisplayResultActivity extends AppCompatActivity {
...
@@ -26,7 +26,7 @@ public class DisplayResultActivity extends AppCompatActivity {
public
static
final
int
GIF_RESULT_CODE
=
42
;
public
static
final
int
GIF_RESULT_CODE
=
42
;
private
int
m_index
;
private
int
m_index
;
private
DnDSheet
m_sheet
;
private
DnDSheet
m_sheet
;
private
TextView
lbl_displayResult_class
,
lbl_displayResult_description
,
lbl_displayResult_system
,
private
TextView
lbl_displayResult_name
,
lbl_displayResult_class
,
lbl_displayResult_description
,
lbl_displayResult_system
,
lbl_displayResult_personality
,
lbl_displayResult_skills
,
lbl_displayResult_spells
,
lbl_displayResult_personality
,
lbl_displayResult_skills
,
lbl_displayResult_spells
,
lbl_displayResult_saves
,
lbl_displayResult_str
,
lbl_displayResult_dex
,
lbl_displayResult_saves
,
lbl_displayResult_str
,
lbl_displayResult_dex
,
lbl_displayResult_int
,
lbl_displayResult_con
,
lbl_displayResult_wis
,
lbl_displayResult_int
,
lbl_displayResult_con
,
lbl_displayResult_wis
,
...
@@ -39,6 +39,7 @@ public class DisplayResultActivity extends AppCompatActivity {
...
@@ -39,6 +39,7 @@ public class DisplayResultActivity extends AppCompatActivity {
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
layout_display_result
);
setContentView
(
R
.
layout
.
layout_display_result
);
lbl_displayResult_name
=
findViewById
(
R
.
id
.
lbl_displayResult_name
);
lbl_displayResult_class
=
findViewById
(
R
.
id
.
lbl_displayResult_class
);
lbl_displayResult_class
=
findViewById
(
R
.
id
.
lbl_displayResult_class
);
lbl_displayResult_description
=
findViewById
(
R
.
id
.
lbl_displayResult_description
);
lbl_displayResult_description
=
findViewById
(
R
.
id
.
lbl_displayResult_description
);
lbl_displayResult_system
=
findViewById
(
R
.
id
.
lbl_displayResult_system
);
lbl_displayResult_system
=
findViewById
(
R
.
id
.
lbl_displayResult_system
);
...
@@ -103,6 +104,7 @@ public class DisplayResultActivity extends AppCompatActivity {
...
@@ -103,6 +104,7 @@ public class DisplayResultActivity extends AppCompatActivity {
v_hp
=
"No HP"
;
v_hp
=
"No HP"
;
}
}
lbl_displayResult_name
.
setText
(
m_sheet
.
name
);
lbl_displayResult_class
.
setText
(
m_sheet
.
caracterClass
.
toString
());
lbl_displayResult_class
.
setText
(
m_sheet
.
caracterClass
.
toString
());
lbl_displayResult_description
.
setText
(
m_sheet
.
appearance
);
lbl_displayResult_description
.
setText
(
m_sheet
.
appearance
);
lbl_displayResult_system
.
setText
(
m_sheet
.
system
.
longName
);
lbl_displayResult_system
.
setText
(
m_sheet
.
system
.
longName
);
...
...
app/src/main/java/fr/iutnantes/miar/dndgenerator/adapter/ListResultsAdapter.java
View file @
9d1dd626
package
fr.iutnantes.miar.dndgenerator.adapter
;
package
fr.iutnantes.miar.dndgenerator.adapter
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
...
@@ -16,19 +13,14 @@ import androidx.recyclerview.widget.RecyclerView;
...
@@ -16,19 +13,14 @@ import androidx.recyclerview.widget.RecyclerView;
import
com.bumptech.glide.Glide
;
import
com.bumptech.glide.Glide
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.Objects
;
import
fr.iutnantes.miar.dndgenerator.DisplayGIFActivity
;
import
fr.iutnantes.miar.dndgenerator.DisplayResultActivity
;
import
fr.iutnantes.miar.dndgenerator.DisplayResultActivity
;
import
fr.iutnantes.miar.dndgenerator.R
;
import
fr.iutnantes.miar.dndgenerator.R
;
import
fr.iutnantes.miar.dndgenerator.ResearchResultsActivity
;
import
fr.iutnantes.miar.dndgenerator.ResearchResultsActivity
;
import
fr.iutnantes.miar.dndgenerator.api.dnd.DnDAttr
;
import
fr.iutnantes.miar.dndgenerator.api.dnd.DnDSheet
;
import
fr.iutnantes.miar.dndgenerator.api.dnd.DnDSheet
;
import
fr.iutnantes.miar.dndgenerator.api.tenor.GIFFormat
;
import
fr.iutnantes.miar.dndgenerator.api.tenor.GIFFormat
;
import
fr.iutnantes.miar.dndgenerator.api.tenor.MediaObject
;
/**
/**
* Adapter that extend RecyclerViewAdapter to provide data of list of DnDSheet in a RecycleView
* Adapter that extend RecyclerViewAdapter to provide data of list of DnDSheet in a RecycleView
...
@@ -44,7 +36,7 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
...
@@ -44,7 +36,7 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
* Class to set the view of one result
* Class to set the view of one result
*/
*/
public
static
class
ViewHolder
extends
RecyclerView
.
ViewHolder
{
public
static
class
ViewHolder
extends
RecyclerView
.
ViewHolder
{
private
final
TextView
m_lbl_scpecie
,
m_lbl_description
,
m_lbl_system
;
private
final
TextView
m_lbl_name
,
m_lbl_scpecie
,
m_lbl_description
,
m_lbl_system
;
private
final
ImageView
m_imgGif
;
private
final
ImageView
m_imgGif
;
/**
/**
...
@@ -54,6 +46,7 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
...
@@ -54,6 +46,7 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
public
ViewHolder
(
View
p_view
)
{
public
ViewHolder
(
View
p_view
)
{
super
(
p_view
);
super
(
p_view
);
m_lbl_name
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_name
);
m_lbl_scpecie
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_specie
);
m_lbl_scpecie
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_specie
);
m_lbl_description
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_decription
);
m_lbl_description
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_decription
);
m_lbl_system
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_system
);
m_lbl_system
=
p_view
.
findViewById
(
R
.
id
.
lbl_rclr_system
);
...
@@ -91,6 +84,14 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
...
@@ -91,6 +84,14 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
public
ImageView
getM_imgGif
()
{
public
ImageView
getM_imgGif
()
{
return
m_imgGif
;
return
m_imgGif
;
}
}
/**
* Getter
* @return : Name
*/
public
TextView
getM_lbl_name
()
{
return
m_lbl_name
;
}
}
}
/**
/**
...
@@ -124,6 +125,7 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
...
@@ -124,6 +125,7 @@ public class ListResultsAdapter extends RecyclerView.Adapter<ListResultsAdapter.
*/
*/
@Override
@Override
public
void
onBindViewHolder
(
@NonNull
ViewHolder
holder
,
int
position
)
{
public
void
onBindViewHolder
(
@NonNull
ViewHolder
holder
,
int
position
)
{
holder
.
getM_lbl_name
().
setText
(
m_data
.
get
(
position
).
name
);
holder
.
getM_lbl_scpecie
().
setText
(
m_data
.
get
(
position
).
caracterClass
.
toString
());
holder
.
getM_lbl_scpecie
().
setText
(
m_data
.
get
(
position
).
caracterClass
.
toString
());
holder
.
getM_lbl_description
().
setText
(
m_data
.
get
(
position
).
appearance
);
holder
.
getM_lbl_description
().
setText
(
m_data
.
get
(
position
).
appearance
);
holder
.
getM_lbl_system
().
setText
(
m_data
.
get
(
position
).
system
.
longName
);
holder
.
getM_lbl_system
().
setText
(
m_data
.
get
(
position
).
system
.
longName
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment