diff --git a/app/src/main/java/com/npgames/insight/ui/book/page/GamePageAdapter.java b/app/src/main/java/com/npgames/insight/ui/book/page/GamePageAdapter.java index 2a4ff3e..203f299 100644 --- a/app/src/main/java/com/npgames/insight/ui/book/page/GamePageAdapter.java +++ b/app/src/main/java/com/npgames/insight/ui/book/page/GamePageAdapter.java @@ -9,6 +9,7 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.SpannedString; +import android.text.TextPaint; import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.text.style.ClickableSpan; @@ -107,8 +108,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { switch(holder.getItemViewType()) { case BlockArea.BlockType.TEXT: - ((TextViewHolder)holder).textTextView.setText(formatLinks(content)); - ((TextViewHolder)holder).textTextView.setMovementMethod(LinkMovementMethod.getInstance()); + final TextView textTextView = ((TextViewHolder)holder).textTextView; + textTextView.setText(formatLinks(content)); + textTextView.setMovementMethod(LinkMovementMethod.getInstance()); break; case BlockArea.BlockType.BUTTON: @@ -181,6 +183,12 @@ public void onClick(final View widget) { directoryOpenerListener.openDirectory(directoryItemNumber); } + + @Override + public void updateDrawState(final TextPaint ds) { + super.updateDrawState(ds); + ds.setUnderlineText(false); + } }, startPosition, endPosition, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); text.setSpan(formatOneMatch(tail, pattern, directoryItemNumber), endPosition, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); diff --git a/app/src/main/java/com/npgames/insight/ui/book/top_panel/TopPanelView.java b/app/src/main/java/com/npgames/insight/ui/book/top_panel/TopPanelView.java index 8838925..55aa0d2 100644 --- a/app/src/main/java/com/npgames/insight/ui/book/top_panel/TopPanelView.java +++ b/app/src/main/java/com/npgames/insight/ui/book/top_panel/TopPanelView.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.Canvas; +import android.media.Image; import android.os.Build; import android.os.Bundle; import android.os.Parcelable; @@ -25,6 +26,8 @@ import com.npgames.insight.ui.all.fragments.infoDialog.InfoDialog; import com.npgames.insight.ui.book.bottom_new.actions.BottomActionConfirmDialog; +import org.w3c.dom.Text; + import butterknife.BindView; import butterknife.ButterKnife; @@ -51,15 +54,15 @@ public class TopPanelView extends FrameLayout implements View.OnClickListener { @BindView(R.id.text_view_stats_panel_dex_title) protected ImageView dexTitleTextView; @BindView(R.id.text_view_stats_panel_prc_title) - protected TextView prcTitleTextView; + protected ImageView prcTitleTextView; @BindView(R.id.text_view_stats_panel_au_title) - protected TextView aurTitleTextView; + protected ImageView aurTitleTextView; @BindView(R.id.text_view_stats_panel_hp_title) protected ImageView hpTitleTextView; @BindView(R.id.text_view_stats_panel_time_title) - protected TextView timeTitleTextView; + protected ImageView timeTitleTextView; @BindView(R.id.text_view_stats_panel_mem_title) - protected TextView amnTitleTextView; + protected ImageView amnTitleTextView; private Animation inAnimation; private Animation outAnimation; diff --git a/app/src/main/res/drawable-xxxhdpi/directory_item.9.png b/app/src/main/res/drawable-xxxhdpi/directory_item.9.png new file mode 100644 index 0000000..ac73462 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/directory_item.9.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_agility.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_agility.png new file mode 100644 index 0000000..26ef7c5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_agility.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_agility_2.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_agility_2.png new file mode 100644 index 0000000..ceac6c6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_agility_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_aur.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_aur.png new file mode 100644 index 0000000..2ba71b2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_aur.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_aur_2.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_aur_2.png new file mode 100644 index 0000000..294417b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_aur_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_hp.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_hp.png new file mode 100644 index 0000000..0c34ed5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_hp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_hp_2.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_hp_2.png new file mode 100644 index 0000000..a2f835c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_hp_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_hp_3.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_hp_3.png new file mode 100644 index 0000000..b456cdb Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_hp_3.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_memory.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_memory.png new file mode 100644 index 0000000..6d81780 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_memory.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_memory_2.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_memory_2.png new file mode 100644 index 0000000..4f85923 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_memory_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_prc_2.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_prc_2.png new file mode 100644 index 0000000..99d8ac5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_prc_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_prc_3.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_prc_3.png new file mode 100644 index 0000000..febbcaf Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_prc_3.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_precisious.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_precisious.png new file mode 100644 index 0000000..a5e173e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_precisious.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_time.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_time.png new file mode 100644 index 0000000..93637ac Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_time.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_time_2.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_time_2.png new file mode 100644 index 0000000..aa093dd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_time_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/stats_logo_time_3.png b/app/src/main/res/drawable-xxxhdpi/stats_logo_time_3.png new file mode 100644 index 0000000..e8c1576 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/stats_logo_time_3.png differ diff --git a/app/src/main/res/layout/adapter_directory_item.xml b/app/src/main/res/layout/adapter_directory_item.xml index 0416ef4..1d0743a 100644 --- a/app/src/main/res/layout/adapter_directory_item.xml +++ b/app/src/main/res/layout/adapter_directory_item.xml @@ -7,6 +7,7 @@ android:layout_height="wrap_content"> + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_adapter_page_item.xml b/app/src/main/res/layout/fragment_adapter_page_item.xml index c3912a8..cf39f8f 100644 --- a/app/src/main/res/layout/fragment_adapter_page_item.xml +++ b/app/src/main/res/layout/fragment_adapter_page_item.xml @@ -1,16 +1,18 @@ - + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/layout/layout_stats_panel.xml b/app/src/main/res/layout/layout_stats_panel.xml index b6f7fb9..54cf255 100644 --- a/app/src/main/res/layout/layout_stats_panel.xml +++ b/app/src/main/res/layout/layout_stats_panel.xml @@ -12,191 +12,176 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> + - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/text_view_stats_panel_dex_title" /> + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 03dcbf0..b6d6f5b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,8 +11,9 @@ #59995a #98CAE7 + #6D8EA1 - #EBEFF2 + #EBEFF2T #BCD6E7 #a4a4a5 @@ -26,6 +27,7 @@ @color/green @color/cornflower + @color/bermuda_gray @color/athens_gray @color/powder_blue diff --git a/stats_logos.psd b/stats_logos.psd new file mode 100644 index 0000000..7cc8414 Binary files /dev/null and b/stats_logos.psd differ