diff --git a/app/src/main/java/com/dragons/aurora/fragment/HomeFragment.java b/app/src/main/java/com/dragons/aurora/fragment/HomeFragment.java index 1cf06cc1b..7767d9d95 100755 --- a/app/src/main/java/com/dragons/aurora/fragment/HomeFragment.java +++ b/app/src/main/java/com/dragons/aurora/fragment/HomeFragment.java @@ -6,21 +6,19 @@ import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import com.squareup.picasso.Picasso; import com.dragons.aurora.CircleTransform; import com.dragons.aurora.R; import com.dragons.aurora.activities.AccountsActivity; +import com.dragons.aurora.activities.CategoryAppsActivity; import com.dragons.aurora.view.AdaptiveToolbar; +import com.dragons.aurora.view.TagView; +import com.squareup.picasso.Picasso; public class HomeFragment extends UtilFragment { - private View view; AdaptiveToolbar adtb; + private View view; @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, @@ -31,18 +29,16 @@ public class HomeFragment extends UtilFragment { return view; } view = inflater.inflate(R.layout.fragment_home, container, false); - /*RelativeLayout open_community = view.findViewById(R.id.open_community); - open_community.setOnClickListener(v -> { - Uri uri = Uri.parse("https://t.me/AuroraOfficial"); - Intent intent = new Intent(Intent.ACTION_VIEW, uri); - startActivity(intent); - });*/ + adtb = view.findViewById(R.id.adtb); adtb.getAvatar_icon().setOnClickListener(v -> { Intent intent = new Intent(getContext(), AccountsActivity.class); intent.putExtra("account_profile_animate", true); startActivity(intent); }); + + initTags(); + return view; } @@ -69,8 +65,23 @@ public class HomeFragment extends UtilFragment { .getDrawable(R.drawable.ic_dummy_avatar)); } } + protected void resetUser() { (adtb.getAvatar_icon()).setImageDrawable(getResources() - .getDrawable(R.drawable.ic_user_placeholder)); + .getDrawable(R.drawable.ic_user_placeholder)); + } + + protected void initTags() + { + setupTag(view,R.id.tag_gamesAction,"GAME_ACTION"); + setupTag(view,R.id.tag_family,"FAMILY"); + setupTag(view,R.id.tag_gamesRacing,"GAME_RACING"); + setupTag(view,R.id.tag_travel,"TRAVEL_AND_LOCAL"); + setupTag(view,R.id.tag_social,"SOCIAL"); + } + + protected void setupTag(View v, int viewID, String Category) { + TagView tagView = v.findViewById(viewID); + tagView.setOnClickListener(click -> CategoryAppsActivity.start(v.getContext(), Category)); } } diff --git a/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java b/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java index cdc7e532c..5bc3c17a6 100644 --- a/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java +++ b/app/src/main/java/com/dragons/aurora/fragment/SearchFragment.java @@ -33,7 +33,7 @@ import com.dragons.aurora.RecyclerItemTouchHelper; import com.dragons.aurora.activities.SearchActivity; import com.dragons.aurora.adapters.SearchHistoryAdapter; -public class SearchFragment extends Fragment implements RecyclerItemTouchHelper.RecyclerItemTouchHelperListener { +public class SearchFragment extends UtilFragment implements RecyclerItemTouchHelper.RecyclerItemTouchHelperListener { SearchView searchToolbar; ArrayList listHistory = new ArrayList<>(); diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f1e8e2297..b77caf3e2 100755 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -32,33 +32,65 @@ android:layout_marginTop="2dp" android:nestedScrollingEnabled="false" /> - + android:nestedScrollingEnabled="false" + android:scrollbars="none"> - + android:orientation="horizontal"> - + - + - + + + + + + + + + - + android:textColor="?android:attr/textColorPrimary" /> + android:alpha="0.8" + android:background="?android:attr/colorForeground" /> + android:textColor="?android:attr/textColorPrimary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/tagview_mono.xml b/app/src/main/res/layout/tagview_mono.xml index 1d328d5e4..d089720be 100644 --- a/app/src/main/res/layout/tagview_mono.xml +++ b/app/src/main/res/layout/tagview_mono.xml @@ -4,15 +4,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/top_category_bg" - android:backgroundTint="?attr/colorAccent"> + android:backgroundTint="?android:attr/colorForeground"> + android:textColor="?android:attr/textColorPrimary" /> \ No newline at end of file