OneUIProject
diff --git a/‎README.md‎
Lines changed: 17 additions & 1385 deletions b/‎README.md‎
Lines changed: 17 additions & 1385 deletions
diff --git a/‎app/build.gradle‎
Lines changed: 4 additions & 4 deletions b/‎app/build.gradle‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎app/release/app-release.apk‎
2.93 MB b/‎app/release/app-release.apk‎
2.93 MB
diff --git a/‎app/release/output-metadata.json‎
Lines changed: 2 additions & 2 deletions b/‎app/release/output-metadata.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/src/main/AndroidManifest.xml‎
Lines changed: 3 additions & 3 deletions b/‎app/src/main/AndroidManifest.xml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/MainActivity.java‎
Lines changed: 107 additions & 96 deletions b/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/MainActivity.java‎
Lines changed: 107 additions & 96 deletions
diff --git a/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/SwitchBarActivity.java‎
Lines changed: 9 additions & 8 deletions b/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/SwitchBarActivity.java‎
Lines changed: 9 additions & 8 deletions
diff --git a/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java‎
Lines changed: 4 additions & 1 deletion b/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivityFirstFragment.java‎
Lines changed: 51 additions & 9 deletions b/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivityFirstFragment.java‎
Lines changed: 51 additions & 9 deletions
diff --git a/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivitySecondFragment.java‎
Lines changed: 6 additions & 0 deletions b/‎app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivitySecondFragment.java‎
Lines changed: 6 additions & 0 deletions
@@ -51,12 +51,12 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation project(path: ':yanndroid:oneui')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 56,
-      "versionName": "2.2.1",
+      "versionCode": 57,
+      "versionName": "2.3.0",
       "outputFile": "app-release.apk"
     }
   ],
 
@@ -15,9 +15,6 @@
         <meta-data
             android:name="com.samsung.android.icon_container.has_icon_container"
             android:value="true" />
-        <meta-data
-            android:name="com.samsung.android.icon_container.feature_appicon"
-            android:value="ADAPTIVEICON_SHADOW" />
 
         <activity android:name=".SwitchBarActivity" />
         <activity
@@ -30,6 +27,9 @@
             android:name=".SplashActivity"
             android:theme="@style/OneUISplashTheme"
             android:exported="true">
+            <meta-data
+                android:name="com.sec.android.app.launcher.icon_theme" android:value="themeColor"/>
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
 
@@ -3,12 +3,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Toast;
 
 import de.dlyt.yanndroid.oneui.layout.SwitchBarLayout;
 import de.dlyt.yanndroid.oneui.layout.ToolbarLayout;
-import de.dlyt.yanndroid.oneui.view.Switch;
-import de.dlyt.yanndroid.oneui.view.SwitchBar;
+import de.dlyt.yanndroid.oneui.widget.Switch;
+import de.dlyt.yanndroid.oneui.widget.SwitchBar;
 import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
 
 public class SwitchBarActivity extends BaseThemeActivity implements SwitchBar.OnSwitchChangeListener {
@@ -20,16 +21,16 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_switchbar);
 
         SwitchBarLayout switchBarLayout = findViewById(R.id.switchbarlayout_switchbaractivity);
-        ToolbarLayout toolbarLayout = switchBarLayout.getToolbarLayout();
-
-        toolbarLayout.inflateToolbarMenu(R.menu.switchpreferencescreen_menu);
-        toolbarLayout.setOnToolbarMenuItemClickListener(item -> {
+        switchBarLayout.setNavigationButtonTooltip(getString(R.string.sesl_navigate_up));
+        switchBarLayout.setNavigationButtonOnClickListener(view -> onBackPressed());
+        switchBarLayout.inflateToolbarMenu(R.menu.switchpreferencescreen_menu);
+        switchBarLayout.setOnToolbarMenuItemClickListener(item -> {
             Toast.makeText(this, "Item clicked", Toast.LENGTH_SHORT).show();
             return true;
         });
 
-        switchBarLayout.getSwitchBar().setChecked(getSwitchBarDefaultStatus());
-        switchBarLayout.getSwitchBar().addOnSwitchChangeListener(this);
+        switchBarLayout.setChecked(getSwitchBarDefaultStatus());
+        switchBarLayout.addOnSwitchChangeListener(this);
     }
 
     private boolean getSwitchBarDefaultStatus() {
 
@@ -23,11 +23,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         int normalTheme = mUseOUI4Theme ? R.style.OneUI4Theme : R.style.OneUI3Theme;
         int altTheme = mUseOUI4Theme ? R.style.OneUI4AboutTheme : R.style.OneUI3AboutTheme;
-
         setTheme(mUseAltTheme ? altTheme : normalTheme);
         new ThemeUtil(this);
 
         super.onCreate(savedInstanceState);
+
+        int normalThemeNavBar = mUseOUI4Theme ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor;
+        int altThemeNavBar = R.color.splash_background;
+        getWindow().setNavigationBarColor(getResources().getColor(mUseAltTheme ? altThemeNavBar : normalThemeNavBar));
     }
 
     protected void switchOUITheme() {
 
@@ -6,16 +6,21 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
-import de.dlyt.yanndroid.oneui.view.TabLayout;
-import de.dlyt.yanndroid.oneui.view.ViewPager;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import de.dlyt.yanndroid.oneui.sesl.tabs.SamsungTabLayout;
+import de.dlyt.yanndroid.oneui.sesl.tabs.TabLayoutMediator;
+import de.dlyt.yanndroid.oneui.sesl.viewpager2.widget.SeslViewPager2;
+import de.dlyt.yanndroid.oneui.view.ViewPager2;
+import de.dlyt.yanndroid.oneui.widget.TabLayout;
 import de.dlyt.yanndroid.oneuiexample.R;
 import de.dlyt.yanndroid.oneuiexample.base.BaseThemeActivity;
-import de.dlyt.yanndroid.oneuiexample.tabs.ViewPagerAdapter;
+import de.dlyt.yanndroid.oneuiexample.tabs.ViewPager2Adapter;
 
 public class MainActivityFirstFragment extends Fragment {
-
     private BaseThemeActivity mActivity;
     private Context mContext;
     private View mRootView;
@@ -40,11 +45,48 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         getView().setBackgroundColor(getResources().getColor(mActivity.mUseOUI4Theme ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor));
 
         // TabLayout and ViewPager
-        TabLayout tabLayout = mRootView.findViewById(R.id.tabLayout);
-        ViewPager viewPager = mRootView.findViewById(R.id.viewPager);
-        viewPager.setAdapter(new ViewPagerAdapter(getChildFragmentManager()));
-        tabLayout.setupWithViewPager(viewPager);
-        tabLayout.updateWidget();
+        FloatingActionButton fab = mActivity.findViewById(R.id.sesl_fab);
+        TabLayout subTabs = mRootView.findViewById(R.id.sub_tabs);
+        subTabs.seslSetSubTabStyle();
+        ViewPager2 viewPager2 = mRootView.findViewById(R.id.viewPager2);
+        viewPager2.setAdapter(new ViewPager2Adapter(this));
+        viewPager2.registerOnPageChangeCallback(new SeslViewPager2.OnPageChangeCallback() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                if (position == 0) {
+                    fab.show();
+                } else {
+                    fab.hide();
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 0) {
+                    fab.show();
+                } else {
+                    fab.hide();
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+                if (state == ViewPager2.SCROLL_STATE_IDLE && viewPager2.getCurrentItem() == 0) {
+                    fab.show();
+                } else {
+                    fab.hide();
+                }
+            }
+        });
+
+        TabLayoutMediator tlm = new TabLayoutMediator(subTabs, viewPager2, new TabLayoutMediator.TabConfigurationStrategy() {
+            @Override
+            public void onConfigureTab(@NonNull SamsungTabLayout.Tab tab, int position) {
+                String[] tabTitle = {"Views", "Icons", "Nothing"};
+                tab.setText(tabTitle[position]);
+            }
+        });
+        tlm.attach();
     }
 
 }
@@ -4,6 +4,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Toast;
 
 import androidx.appcompat.util.SeslMisc;
 
@@ -56,6 +57,11 @@ public void onCancelClicked(View view) {
                     parent.removePreference(findPreference("spacing"));
                 }
             }
+
+            @Override
+            public void onViewClicked(View view) {
+                Toast.makeText(mContext, "TipsCardView clicked", Toast.LENGTH_SHORT).show();
+            }
         });
 
         HorizontalRadioPreference darkModePref = (HorizontalRadioPreference) findPreference("dark_mode");