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

Commit 39b1dcd

Browse files
YanndroidYanndroid
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 6cf80a3 + aea3c00 commit 39b1dcd

File tree

8 files changed

+89
-76
lines changed

8 files changed

+89
-76
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22

33
import android.os.Bundle;
44

5-
import androidx.appcompat.app.AppCompatActivity;
6-
75
import com.google.android.material.button.MaterialButton;
86

97
import de.dlyt.yanndroid.oneui.layout.AboutPage;
10-
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
8+
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
119

12-
public class AboutActivity extends AppCompatActivity {
10+
public class AboutActivity extends BaseThemeActivity {
1311

1412
@Override
1513
protected void onCreate(Bundle savedInstanceState) {
16-
new ThemeUtil(this);
1714
super.onCreate(savedInstanceState);
1815
setContentView(R.layout.activity_about);
1916

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

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import androidx.activity.result.ActivityResultLauncher;
2121
import androidx.activity.result.contract.ActivityResultContracts;
22-
import androidx.appcompat.app.AppCompatActivity;
2322
import androidx.appcompat.util.SeslMisc;
2423
import androidx.fragment.app.Fragment;
2524
import androidx.fragment.app.FragmentManager;
@@ -39,14 +38,14 @@
3938
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
4039
import de.dlyt.yanndroid.oneui.view.BottomNavigationView;
4140
import de.dlyt.yanndroid.oneui.view.Snackbar;
41+
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
4242
import de.dlyt.yanndroid.oneuiexample.utils.TabsManager;
4343

44-
public class MainActivity extends AppCompatActivity {
44+
public class MainActivity extends BaseThemeActivity {
4545
private String[] mTabsTagName;
4646
private String[] mTabsTitleName;
4747
private String[] mTabsClassName;
4848

49-
private boolean mIsLightTheme;
5049
private String sharedPrefName;
5150

5251
private Context mContext;
@@ -63,7 +62,6 @@ public class MainActivity extends AppCompatActivity {
6362

6463
@Override
6564
protected void onCreate(Bundle savedInstanceState) {
66-
new ThemeUtil(this);
6765
super.onCreate(savedInstanceState);
6866
mContext = this;
6967
setContentView(R.layout.activity_main);
@@ -113,8 +111,6 @@ protected void onResume() {
113111
private void init() {
114112
ViewSupport.semSetRoundedCorners(getWindow().getDecorView(), 0);
115113

116-
mIsLightTheme = SeslMisc.isLightTheme(mContext);
117-
118114
drawerLayout = findViewById(R.id.drawer_view);
119115
toolbarLayout = drawerLayout.getToolbarLayout();
120116
bnvLayout = findViewById(R.id.main_samsung_tabs);
@@ -148,49 +144,55 @@ private void init() {
148144
});
149145

150146
toolbarLayout.inflateToolbarMenu(R.menu.main);
147+
toolbarLayout.getToolbarMenu().findItem(R.id.theme_toggle).setTitle(mUseOUI4Theme ? "Switch to OneUI 3 Theme" : "Switch to OneUI 4 Theme");
151148
toolbarLayout.setOnToolbarMenuItemClickListener(item -> {
152149
switch (item.getItemId()) {
153150
case R.id.search:
154-
toolbarLayout.setSearchModeListener(new ToolbarLayout.SearchModeListener() {
155-
@Override
156-
public void onSearchOpened(EditText search_edittext) {
157-
}
158-
159-
@Override
160-
public void onSearchDismissed(EditText search_edittext) {
161-
}
162-
163-
@Override
164-
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
165-
}
166-
167-
@Override
168-
public void onTextChanged(CharSequence s, int start, int before, int count) {
169-
}
170-
171-
@Override
172-
public void afterTextChanged(Editable s) {
173-
}
174-
175-
@Override
176-
public void onKeyboardSearchClick(CharSequence s) {
177-
Toast.makeText(mContext, s, Toast.LENGTH_SHORT).show();
178-
}
179-
180-
@Override
181-
public void onVoiceInputClick(Intent intent) {
182-
activityResultLauncher.launch(intent);
183-
}
184-
});
185151
toolbarLayout.showSearchMode();
152+
item.setBadge(item.getBadge() + 1);
186153
break;
187154
case R.id.info:
188155
startActivity(new Intent().setClass(mContext, AboutActivity.class));
156+
item.setBadge(item.getBadge() + 1);
157+
break;
158+
case R.id.theme_toggle:
159+
switchOUITheme();
189160
break;
190161
}
191-
item.setBadge(item.getBadge() + 1);
162+
192163
return true;
193164
});
165+
toolbarLayout.setSearchModeListener(new ToolbarLayout.SearchModeListener() {
166+
@Override
167+
public void onSearchOpened(EditText search_edittext) {
168+
}
169+
170+
@Override
171+
public void onSearchDismissed(EditText search_edittext) {
172+
}
173+
174+
@Override
175+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
176+
}
177+
178+
@Override
179+
public void onTextChanged(CharSequence s, int start, int before, int count) {
180+
}
181+
182+
@Override
183+
public void afterTextChanged(Editable s) {
184+
}
185+
186+
@Override
187+
public void onKeyboardSearchClick(CharSequence s) {
188+
Toast.makeText(mContext, s, Toast.LENGTH_SHORT).show();
189+
}
190+
191+
@Override
192+
public void onVoiceInputClick(Intent intent) {
193+
activityResultLauncher.launch(intent);
194+
}
195+
});
194196

195197
//BottomNavigationLayout
196198
Drawable icon = getDrawable(R.drawable.ic_samsung_drawer);

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@
66
import android.os.Looper;
77
import android.view.animation.Animation;
88

9-
import androidx.appcompat.app.AppCompatActivity;
10-
119
import de.dlyt.yanndroid.oneui.layout.SplashView;
12-
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
10+
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
1311

14-
public class SplashActivity extends AppCompatActivity {
12+
public class SplashActivity extends BaseThemeActivity {
1513

1614
private boolean launchCanceled = false;
1715

1816
@Override
1917
protected void onCreate(Bundle savedInstanceState) {
20-
new ThemeUtil(this);
2118
super.onCreate(savedInstanceState);
2219
setContentView(R.layout.activity_splash);
2320

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
package de.dlyt.yanndroid.oneuiexample;
22

33
import android.content.Context;
4-
import android.content.Intent;
54
import android.content.SharedPreferences;
65
import android.os.Bundle;
7-
import android.text.Editable;
8-
import android.widget.EditText;
96
import android.widget.Toast;
107

11-
import androidx.appcompat.app.AppCompatActivity;
12-
138
import de.dlyt.yanndroid.oneui.layout.SwitchBarLayout;
149
import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
15-
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
1610
import de.dlyt.yanndroid.oneui.view.Switch;
1711
import de.dlyt.yanndroid.oneui.view.SwitchBar;
12+
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
1813

19-
public class SwitchBarActivity extends AppCompatActivity implements SwitchBar.OnSwitchChangeListener {
14+
public class SwitchBarActivity extends BaseThemeActivity implements SwitchBar.OnSwitchChangeListener {
2015
@Override
2116
protected void onCreate(Bundle savedInstanceState) {
22-
new ThemeUtil(this);
2317
super.onCreate(savedInstanceState);
2418
setContentView(R.layout.activity_switchbar);
2519

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package de.dlyt.yanndroid.oneuiexample.base;
2+
3+
import android.content.Context;
4+
import android.content.SharedPreferences;
5+
import android.os.Bundle;
6+
7+
import androidx.appcompat.app.AppCompatActivity;
8+
9+
import de.dlyt.yanndroid.oneui.utils.ThemeUtil;
10+
import de.dlyt.yanndroid.oneuiexample.BuildConfig;
11+
import de.dlyt.yanndroid.oneuiexample.R;
12+
13+
public class BaseThemeActivity extends AppCompatActivity {
14+
private static String SP_NAME = BuildConfig.APPLICATION_ID + "_preferences";
15+
private SharedPreferences sp;
16+
public boolean mUseOUI4Theme;
17+
18+
@Override
19+
protected void onCreate(Bundle savedInstanceState) {
20+
sp = getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
21+
mUseOUI4Theme = sp.getBoolean("use_oui4_theme", true);
22+
23+
setTheme(mUseOUI4Theme ? R.style.OneUI4Theme : R.style.OneUI3Theme);
24+
new ThemeUtil(this);
25+
26+
super.onCreate(savedInstanceState);
27+
}
28+
29+
protected void switchOUITheme() {
30+
sp.edit().putBoolean("use_oui4_theme", !mUseOUI4Theme).apply();
31+
recreate();
32+
}
33+
}

‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivityFirstFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
import android.view.View;
77
import android.view.ViewGroup;
88

9-
import androidx.appcompat.app.AppCompatActivity;
109
import androidx.fragment.app.Fragment;
1110

1211
import de.dlyt.yanndroid.oneui.view.TabLayout;
1312
import de.dlyt.yanndroid.oneui.view.ViewPager;
1413
import de.dlyt.yanndroid.oneuiexample.R;
14+
import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
1515
import de.dlyt.yanndroid.oneuiexample.tabs.ViewPagerAdapter;
1616

1717
public class MainActivityFirstFragment extends Fragment {
1818

19-
private AppCompatActivity mActivity;
19+
private BaseThemeActivity mActivity;
2020
private Context mContext;
2121
private View mRootView;
2222

2323
@Override
2424
public void onAttach(Context context) {
2525
super.onAttach(context);
26-
mActivity = (AppCompatActivity) getActivity();
26+
mActivity = (BaseThemeActivity) getActivity();
2727
mContext = mActivity.getApplicationContext();
2828
}
2929

@@ -37,7 +37,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
3737
public void onViewCreated(View view, Bundle savedInstanceState) {
3838
super.onViewCreated(view, savedInstanceState);
3939

40-
getView().setBackgroundColor(getResources().getColor(R.color.sesl4_round_and_bgcolor));
40+
getView().setBackgroundColor(getResources().getColor(mActivity.mUseOUI4Theme ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor));
4141

4242
// TabLayout and ViewPager
4343
TabLayout tabLayout = mRootView.findViewById(R.id.tabLayout);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="wrap_content" />
1919

2020
<com.google.android.material.textview.MaterialTextView
21-
style="@style/OneUI4.ListSeparatorStyle"
21+
style="?android:listSeparatorTextViewStyle"
2222
android:text="ProgressBar" />
2323

2424

@@ -77,7 +77,7 @@
7777
</com.google.android.material.card.MaterialCardView>
7878

7979
<com.google.android.material.textview.MaterialTextView
80-
style="@style/OneUI4.ListSeparatorStyle"
80+
style="?android:listSeparatorTextViewStyle"
8181
android:text="SeekBar" />
8282

8383
<com.google.android.material.card.MaterialCardView
@@ -117,7 +117,7 @@
117117

118118

119119
<com.google.android.material.textview.MaterialTextView
120-
style="@style/OneUI4.ListSeparatorStyle"
120+
style="?android:listSeparatorTextViewStyle"
121121
android:text="Buttons" />
122122

123123

@@ -234,7 +234,7 @@
234234

235235

236236
<com.google.android.material.textview.MaterialTextView
237-
style="@style/OneUI4.ListSeparatorStyle"
237+
style="?android:listSeparatorTextViewStyle"
238238
android:text="Others" />
239239

240240

@@ -284,7 +284,7 @@
284284

285285

286286
<com.google.android.material.textview.MaterialTextView
287-
style="@style/OneUI4.ListSeparatorStyle"
287+
style="?android:listSeparatorTextViewStyle"
288288
android:text="Color Pickers" />
289289

290290

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,8 @@
1515
app:showAsAction="always" />
1616

1717
<item
18-
android:id="@+id/item1"
18+
android:id="@+id/theme_toggle"
1919
android:title="Menu Item 1"
2020
app:showAsAction="never" />
2121

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-
3222
</menu>

0 commit comments

Comments
 (0)