Made multicolored rows (gray-white), the text in SearchView is now white.
This commit is contained in:
parent
798ceff79f
commit
9d7e85a80c
@ -20,6 +20,7 @@ public interface MainContract {
|
|||||||
void onFailureAnswer(int errorCode);
|
void onFailureAnswer(int errorCode);
|
||||||
void refreshTree();
|
void refreshTree();
|
||||||
void startActivityByIntent(Intent intent);
|
void startActivityByIntent(Intent intent);
|
||||||
|
int incTreeNodeIndex();
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Presenter {
|
interface Presenter {
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
package ru.volgorobot.vrcatalog.nodeViewBinders;
|
package ru.volgorobot.vrcatalog.nodeViewBinders;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.support.v7.widget.RecyclerView;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import me.texy.treeview.TreeNode;
|
import me.texy.treeview.TreeNode;
|
||||||
@ -15,12 +18,16 @@ import ru.volgorobot.vrcatalog.model.FirstLevelModel;
|
|||||||
public class FirstLevelNodeViewBinder extends BaseNodeViewBinder implements MainContract.ViewBinder {
|
public class FirstLevelNodeViewBinder extends BaseNodeViewBinder implements MainContract.ViewBinder {
|
||||||
TextView textView;
|
TextView textView;
|
||||||
ImageView imageView;
|
ImageView imageView;
|
||||||
|
RelativeLayout layout;
|
||||||
ViewBinderPresenter viewBinderPresenter;
|
ViewBinderPresenter viewBinderPresenter;
|
||||||
|
private MainContract.MainActivityView mView;
|
||||||
|
|
||||||
public FirstLevelNodeViewBinder(View itemView, MainContract.MainActivityView mView, Context context) {
|
public FirstLevelNodeViewBinder(View itemView, MainContract.MainActivityView mView, Context context) {
|
||||||
super(itemView);
|
super(itemView);
|
||||||
textView = (TextView) itemView.findViewById(R.id.node_name_view);
|
textView = (TextView) itemView.findViewById(R.id.node_name_view);
|
||||||
imageView = (ImageView) itemView.findViewById(R.id.arrow_img);
|
imageView = (ImageView) itemView.findViewById(R.id.arrow_img);
|
||||||
|
layout = itemView.findViewById(R.id.parent_node_container_1);
|
||||||
|
this.mView = mView;
|
||||||
viewBinderPresenter = new ViewBinderPresenter(mView, this, context);
|
viewBinderPresenter = new ViewBinderPresenter(mView, this, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,6 +39,14 @@ public class FirstLevelNodeViewBinder extends BaseNodeViewBinder implements Main
|
|||||||
@Override
|
@Override
|
||||||
public void bindView(TreeNode treeNode) {
|
public void bindView(TreeNode treeNode) {
|
||||||
textView.setText(treeNode.getValue().toString());
|
textView.setText(treeNode.getValue().toString());
|
||||||
|
imageView.setRotation(treeNode.isExpanded() ? 90 : 0);
|
||||||
|
int index = mView.incTreeNodeIndex();
|
||||||
|
treeNode.setIndex(index);
|
||||||
|
if(index % 2 == 1) {
|
||||||
|
layout.setBackgroundColor(Color.parseColor("#FFFFFF"));
|
||||||
|
} else {
|
||||||
|
layout.setBackgroundColor(Color.parseColor("#BABABA"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -48,4 +63,5 @@ public class FirstLevelNodeViewBinder extends BaseNodeViewBinder implements Main
|
|||||||
public void rotateImageView() {
|
public void rotateImageView() {
|
||||||
imageView.animate().rotation(90).setDuration(200).start();
|
imageView.animate().rotation(90).setDuration(200).start();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
package ru.volgorobot.vrcatalog.nodeViewBinders;
|
package ru.volgorobot.vrcatalog.nodeViewBinders;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import me.texy.treeview.TreeNode;
|
import me.texy.treeview.TreeNode;
|
||||||
@ -15,6 +17,8 @@ import ru.volgorobot.vrcatalog.model.SecondLevelModel;
|
|||||||
public class SecondLevelNodeViewBinder extends BaseNodeViewBinder implements MainContract.ViewBinder {
|
public class SecondLevelNodeViewBinder extends BaseNodeViewBinder implements MainContract.ViewBinder {
|
||||||
TextView textView;
|
TextView textView;
|
||||||
ImageView imageView;
|
ImageView imageView;
|
||||||
|
RelativeLayout layout;
|
||||||
|
private MainContract.MainActivityView mView;
|
||||||
MainContract.LevelLoaderPresenter viewBinderPresenter;
|
MainContract.LevelLoaderPresenter viewBinderPresenter;
|
||||||
|
|
||||||
|
|
||||||
@ -22,6 +26,8 @@ public class SecondLevelNodeViewBinder extends BaseNodeViewBinder implements Mai
|
|||||||
super(itemView);
|
super(itemView);
|
||||||
textView = (TextView) itemView.findViewById(R.id.node_name_view);
|
textView = (TextView) itemView.findViewById(R.id.node_name_view);
|
||||||
imageView = (ImageView) itemView.findViewById(R.id.arrow_img);
|
imageView = (ImageView) itemView.findViewById(R.id.arrow_img);
|
||||||
|
layout = itemView.findViewById(R.id.parent_node_container_2);
|
||||||
|
this.mView = mView;
|
||||||
viewBinderPresenter = new ViewBinderPresenter(mView, this, context);
|
viewBinderPresenter = new ViewBinderPresenter(mView, this, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,6 +40,13 @@ public class SecondLevelNodeViewBinder extends BaseNodeViewBinder implements Mai
|
|||||||
public void bindView(final TreeNode treeNode) {
|
public void bindView(final TreeNode treeNode) {
|
||||||
textView.setText(treeNode.getValue().toString());
|
textView.setText(treeNode.getValue().toString());
|
||||||
imageView.setRotation(treeNode.isExpanded() ? 90 : 0);
|
imageView.setRotation(treeNode.isExpanded() ? 90 : 0);
|
||||||
|
int index = mView.incTreeNodeIndex();
|
||||||
|
treeNode.setIndex(index);
|
||||||
|
if(index % 2 == 1) {
|
||||||
|
layout.setBackgroundColor(Color.parseColor("#FFFFFF"));
|
||||||
|
} else {
|
||||||
|
layout.setBackgroundColor(Color.parseColor("#BABABA"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
package ru.volgorobot.vrcatalog.nodeViewBinders;
|
package ru.volgorobot.vrcatalog.nodeViewBinders;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import me.texy.treeview.TreeNode;
|
import me.texy.treeview.TreeNode;
|
||||||
@ -13,12 +15,16 @@ import ru.volgorobot.vrcatalog.model.ThirdLevelModel;
|
|||||||
|
|
||||||
public class ThirdLevelNodeViewBinder extends BaseNodeViewBinder implements MainContract.ViewBinder {
|
public class ThirdLevelNodeViewBinder extends BaseNodeViewBinder implements MainContract.ViewBinder {
|
||||||
TextView textView;
|
TextView textView;
|
||||||
|
RelativeLayout layout;
|
||||||
|
private MainContract.MainActivityView mView;
|
||||||
MainContract.LevelLoaderPresenter viewBinderPresenter;
|
MainContract.LevelLoaderPresenter viewBinderPresenter;
|
||||||
|
|
||||||
public ThirdLevelNodeViewBinder(View itemView, Context context, MainContract.MainActivityView mView) {
|
public ThirdLevelNodeViewBinder(View itemView, Context context, MainContract.MainActivityView mView) {
|
||||||
super(itemView);
|
super(itemView);
|
||||||
viewBinderPresenter = new ViewBinderPresenter(mView, this, context);
|
viewBinderPresenter = new ViewBinderPresenter(mView, this, context);
|
||||||
textView = itemView.findViewById(R.id.node_name_view);
|
textView = itemView.findViewById(R.id.node_name_view);
|
||||||
|
layout = itemView.findViewById(R.id.parent_node_container_3);
|
||||||
|
this.mView = mView;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -29,6 +35,13 @@ public class ThirdLevelNodeViewBinder extends BaseNodeViewBinder implements Main
|
|||||||
@Override
|
@Override
|
||||||
public void bindView(final TreeNode treeNode) {
|
public void bindView(final TreeNode treeNode) {
|
||||||
textView.setText(treeNode.getValue().toString());
|
textView.setText(treeNode.getValue().toString());
|
||||||
|
int index = mView.incTreeNodeIndex();
|
||||||
|
treeNode.setIndex(index);
|
||||||
|
if(index % 2 == 1) {
|
||||||
|
layout.setBackgroundColor(Color.parseColor("#FFFFFF"));
|
||||||
|
} else {
|
||||||
|
layout.setBackgroundColor(Color.parseColor("#BABABA"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -45,6 +45,7 @@ public class MainActivity extends AppCompatActivity
|
|||||||
private ImageView mConnectionErrorImageView;
|
private ImageView mConnectionErrorImageView;
|
||||||
private ViewGroup mTreeViewContainer;
|
private ViewGroup mTreeViewContainer;
|
||||||
private TextView mErrorTextView;
|
private TextView mErrorTextView;
|
||||||
|
private int treeNodeIndex;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
@ -206,6 +207,10 @@ public class MainActivity extends AppCompatActivity
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int incTreeNodeIndex() {
|
||||||
|
return treeNodeIndex++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -147,4 +147,9 @@ public class SearchableActivity extends AppCompatActivity implements MainContrac
|
|||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int incTreeNodeIndex() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
android:background="?attr/colorPrimary"
|
android:background="?attr/colorPrimary"
|
||||||
android:theme="@style/CustomSearchStyle"
|
android:theme="@style/MainActivity"
|
||||||
app:titleTextColor="@android:color/white"
|
app:titleTextColor="@android:color/white"
|
||||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/parent_node_container_1"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="50dp"
|
android:layout_height="50dp"
|
||||||
android:background="?android:selectableItemBackground">
|
android:background="?android:selectableItemBackground">
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/parent_node_container_2"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="50dp"
|
android:layout_height="50dp"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/parent_node_container_3"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
@ -25,7 +25,9 @@
|
|||||||
<item name="android:textColorPrimary">@android:color/black</item>
|
<item name="android:textColorPrimary">@android:color/black</item>
|
||||||
<item name="android:textColorSecondary">@android:color/black</item>
|
<item name="android:textColorSecondary">@android:color/black</item>
|
||||||
</style>
|
</style>
|
||||||
<style name="CustomSearchStyle" parent="AppTheme">
|
<style name="MainActivity" parent="AppTheme.NoActionBar">
|
||||||
|
<item name="android:editTextColor">@android:color/white</item>
|
||||||
|
<item name="android:textColorHint">@android:color/white</item>
|
||||||
<item name="suggestionRowLayout">@layout/light_suggestion_hint</item>
|
<item name="suggestionRowLayout">@layout/light_suggestion_hint</item>
|
||||||
<item name="colorControlNormal">@android:color/white</item>
|
<item name="colorControlNormal">@android:color/white</item>
|
||||||
<item name="android:colorControlNormal">@android:color/white</item>
|
<item name="android:colorControlNormal">@android:color/white</item>
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
<style name="MainActivity" parent="AppTheme.NoActionBar">
|
<style name="MainActivity" parent="AppTheme.NoActionBar">
|
||||||
<item name="android:editTextColor">@android:color/white</item>
|
<item name="android:editTextColor">@android:color/white</item>
|
||||||
<item name="android:textColorHint">@android:color/white</item>
|
<item name="android:textColorHint">@android:color/white</item>
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="CustomSearchStyle" parent="AppTheme">
|
|
||||||
<item name="suggestionRowLayout">@layout/light_suggestion_hint</item>
|
<item name="suggestionRowLayout">@layout/light_suggestion_hint</item>
|
||||||
<item name="colorControlNormal">@android:color/white</item>
|
<item name="colorControlNormal">@android:color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user