Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit eeab8aa

Browse files
YanndroidYanndroid
committed
toolbar search mode, fixes++
1 parent ffe4671 commit eeab8aa

File tree

107 files changed

+646
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+646
-189
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
android:name="com.samsung.android.icon_container.feature_appicon"
2020
android:value="ADAPTIVEICON_SHADOW" />
2121

22-
<activity android:name="de.dlyt.yanndroid.oneuiexample.SwitchBarActivity" />
22+
<activity android:name=".SwitchBarActivity" />
2323
<activity
24-
android:name="de.dlyt.yanndroid.oneuiexample.AboutActivity"
24+
android:name=".AboutActivity"
2525
android:theme="@style/OneUIAboutTheme" />
2626
<activity
27-
android:name="de.dlyt.yanndroid.oneuiexample.MainActivity"
27+
android:name=".MainActivity"
2828
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
2929
<activity
30-
android:name="de.dlyt.yanndroid.oneuiexample.SplashActivity"
30+
android:name=".SplashActivity"
3131
android:theme="@style/OneUISplashTheme">
3232
<intent-filter>
3333
<action android:name="android.intent.action.MAIN" />

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/MainActivity.java‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
import android.graphics.drawable.Drawable;
1111
import android.os.Build;
1212
import android.os.Bundle;
13-
import android.view.MenuItem;
13+
import android.text.Editable;
1414
import android.view.View;
1515
import android.view.inputmethod.InputMethodManager;
1616
import android.widget.LinearLayout;
17+
import android.widget.Toast;
1718

1819
import androidx.appcompat.app.AppCompatActivity;
1920
import androidx.appcompat.util.SeslMisc;
@@ -139,22 +140,37 @@ private void init() {
139140
}
140141
});
141142

142-
toolbarLayout.inflateMenu(R.menu.main);
143-
toolbarLayout.setOnMenuItemClickListener(new ToolbarLayout.OnMenuItemClickListener() {
144-
@Override
145-
public void onMenuItemClick(MenuItem item) {
146-
switch (item.getItemId()) {
147-
case R.id.search:
148-
break;
149-
case R.id.info:
150-
startActivity(new Intent().setClass(mContext, AboutActivity.class));
151-
break;
152-
case R.id.item1:
153-
case R.id.item2:
154-
case R.id.item3:
155-
toolbarLayout.setOverflowMenuBadge(item, toolbarLayout.getOverflowMenuBadge(item) + 1);
156-
break;
157-
}
143+
toolbarLayout.setOnToolbarMenuItemClickListener(item -> {
144+
switch (item.getItemId()) {
145+
case R.id.search:
146+
toolbarLayout.showSearchMode();
147+
toolbarLayout.setSearchModeListener(new ToolbarLayout.SearchModeListener() {
148+
@Override
149+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
150+
}
151+
152+
@Override
153+
public void onTextChanged(CharSequence s, int start, int before, int count) {
154+
}
155+
156+
@Override
157+
public void afterTextChanged(Editable s) {
158+
}
159+
160+
@Override
161+
public void onKeyboardSearchClick(CharSequence s) {
162+
Toast.makeText(mContext, s, Toast.LENGTH_SHORT).show();
163+
}
164+
});
165+
break;
166+
case R.id.info:
167+
startActivity(new Intent().setClass(mContext, AboutActivity.class));
168+
break;
169+
case R.id.item1:
170+
case R.id.item2:
171+
case R.id.item3:
172+
toolbarLayout.setOverflowMenuBadge(item, toolbarLayout.getOverflowMenuBadge(item) + 1);
173+
break;
158174
}
159175
});
160176

@@ -200,11 +216,13 @@ private void setCurrentItem() {
200216
// MainActivityFirstFragment
201217
toolbarLayout.setSubtitle("Design");
202218
toolbarLayout.setNavigationButtonVisible(true);
219+
toolbarLayout.inflateToolbarMenu(R.menu.main_with_search);
203220
((androidx.drawerlayout.widget.DrawerLayout) drawerLayout.getView(DRAWER_LAYOUT)).setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_UNLOCKED);
204221
} else {
205222
// MainActivitySecondFragment
206223
toolbarLayout.setSubtitle("Preferences");
207224
toolbarLayout.setNavigationButtonVisible(false);
225+
toolbarLayout.inflateToolbarMenu(R.menu.main);
208226
((androidx.drawerlayout.widget.DrawerLayout) drawerLayout.getView(DRAWER_LAYOUT)).setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
209227
}
210228

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/IconsTab.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashMap;
2424

2525
import de.dlyt.yanndroid.oneui.layout.DrawerLayout;
26+
import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
2627
import de.dlyt.yanndroid.oneui.sesl.recyclerview.SeslLinearLayoutManager;
2728
import de.dlyt.yanndroid.oneui.view.BottomNavigationView;
2829
import de.dlyt.yanndroid.oneui.view.RecyclerView;
@@ -293,17 +294,17 @@ public void handleOnBackPressed() {
293294

294295

295296
public void setSelecting(boolean enabled) {
296-
DrawerLayout drawerLayout = getActivity().findViewById(R.id.drawer_view);
297+
ToolbarLayout toolbarLayout = ((DrawerLayout) getActivity().findViewById(R.id.drawer_view)).getToolbarLayout();
297298
TabLayout tabLayout = getActivity().findViewById(R.id.tabLayout);
298299
BottomNavigationView bnv = getActivity().findViewById(R.id.main_samsung_tabs);
299300
ViewPager viewPager = getActivity().findViewById(R.id.viewPager);
300301

301302
if (enabled) {
302303
mSelecting = true;
303304
imageAdapter.notifyItemRangeChanged(0, imageAdapter.getItemCount() - 1);
304-
drawerLayout.setActionModeBottomMenu(R.menu.action_mode_menu, item -> Toast.makeText(mContext, item.getTitle(), Toast.LENGTH_SHORT).show());
305-
drawerLayout.showActionMode();
306-
drawerLayout.setActionModeSelectAllCheckedChangeListener((buttonView, isChecked) -> {
305+
toolbarLayout.setSelectModeBottomMenu(R.menu.action_mode_menu, item -> Toast.makeText(mContext, item.getTitle(), Toast.LENGTH_SHORT).show());
306+
toolbarLayout.showSelectMode();
307+
toolbarLayout.setSelectModeAllCheckedChangeListener((buttonView, isChecked) -> {
307308
if (checkAllListening) {
308309
for (int i = 0; i < imageAdapter.getItemCount() - 1; i++) {
309310
selected.put(i, isChecked);
@@ -312,7 +313,7 @@ public void setSelecting(boolean enabled) {
312313
}
313314
int count = 0;
314315
for (Boolean b : selected.values()) if (b) count++;
315-
drawerLayout.setActionModeSelectCount(count);
316+
toolbarLayout.setSelectModeCount(count);
316317
});
317318
tabLayout.setEnabled(false);
318319
bnv.setEnabled(false);
@@ -323,8 +324,8 @@ public void setSelecting(boolean enabled) {
323324
for (int i = 0; i < imageAdapter.getItemCount() - 1; i++) selected.put(i, false);
324325
imageAdapter.notifyItemRangeChanged(0, imageAdapter.getItemCount() - 1);
325326

326-
drawerLayout.setActionModeSelectCount(0);
327-
drawerLayout.dismissActionMode();
327+
toolbarLayout.setSelectModeCount(0);
328+
toolbarLayout.dismissSelectMode();
328329
tabLayout.setEnabled(true);
329330
bnv.setEnabled(true);
330331
viewPager.setPagingEnabled(true);
@@ -339,9 +340,9 @@ public void toggleItemSelected(int position) {
339340
checkAllListening = false;
340341
int count = 0;
341342
for (Boolean b : selected.values()) if (b) count++;
342-
DrawerLayout drawerLayout = getActivity().findViewById(R.id.drawer_view);
343-
drawerLayout.setActionModeSelectAllChecked(count == imageAdapter.getItemCount() - 1);
344-
drawerLayout.setActionModeSelectCount(count);
343+
ToolbarLayout toolbarLayout = ((DrawerLayout) getActivity().findViewById(R.id.drawer_view)).getToolbarLayout();
344+
toolbarLayout.setSelectModeAllChecked(count == imageAdapter.getItemCount() - 1);
345+
toolbarLayout.setSelectModeCount(count);
345346
checkAllListening = true;
346347
}
347348

‎app/src/main/res/layout-land/activity_switchbar.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:layout_width="0dp"
2525
android:layout_height="wrap_content"
2626
android:layout_weight="4.0"
27-
android:background="@color/switchbar_help_image_bg_color">
27+
android:background="@color/item_background_color">
2828

2929
<ImageView
3030
android:layout_width="150dp"

‎app/src/main/res/layout/activity_switchbar.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<de.dlyt.yanndroid.oneui.layout.RoundFrameLayout
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
29-
android:background="@color/switchbar_help_image_bg_color">
29+
android:background="@color/item_background_color">
3030

3131
<ImageView
3232
android:layout_width="150dp"

‎app/src/main/res/layout/fragment_views_tab.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,11 @@
263263
android:text="TextView"
264264
android:textAlignment="viewStart" />
265265

266+
<EditText
267+
android:layout_width="match_parent"
268+
android:layout_height="wrap_content"
269+
android:hint="EditText" />
270+
266271
<androidx.appcompat.widget.SeslSpinner
267272
android:id="@+id/spinner"
268273
android:layout_width="match_parent"

‎app/src/main/res/menu/main.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
44

5-
<item
6-
android:id="@+id/search"
7-
android:icon="@drawable/ic_samsung_search"
8-
android:title="Search"
9-
app:showAsAction="always" />
10-
115
<item
126
android:id="@+id/info"
137
android:icon="@drawable/ic_samsung_info"

‎app/src/main/res/menu/main_with_search.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
4+
5+
<item
6+
android:id="@+id/search"
7+
android:icon="@drawable/ic_samsung_search"
8+
android:title="@string/action_search"
9+
app:showAsAction="always" />
10+
11+
<item
12+
android:id="@+id/info"
13+
android:icon="@drawable/ic_samsung_info"
14+
android:title="@string/app_info"
15+
app:showAsAction="always" />
16+
17+
<item
18+
android:id="@+id/item1"
19+
android:title="Menu Item 1"
20+
app:showAsAction="never" />
21+
22+
<item
23+
android:id="@+id/item2"
24+
android:title="Menu Item 2"
25+
app:showAsAction="never" />
26+
27+
<item
28+
android:id="@+id/item3"
29+
android:title="Menu Item 3"
30+
app:showAsAction="never" />
31+
32+
</menu>

‎app/src/main/res/values-night/colors.xml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎app/src/main/res/values/colors.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,4 @@
3131
<color name="secondary_color">#ff444444</color>
3232
<color name="primary_dark_color">#ff000000</color>-->
3333

34-
<color name="switchbar_help_image_bg_color">#CCFCFCFC</color>
35-
3634
</resources>

0 commit comments

Comments
 (0)