No need for findViewById wrapper methods anymore

[android-x86/packages-apps-Taskbar.git] / app / src / main / java / com / farmerbb / taskbar / activity / SelectAppActivity.java

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java
index b045a34..4f6b06c 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java
@@ -16,9 +16,11 @@
 package com.farmerbb.taskbar.activity;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.design.widget.TabLayout;
@@ -32,6 +34,7 @@ import android.view.WindowManager;
 import android.widget.ProgressBar;
 
 import com.farmerbb.taskbar.R;
+import com.farmerbb.taskbar.activity.dark.SelectAppActivityDark;
 import com.farmerbb.taskbar.adapter.AppListAdapter;
 import com.farmerbb.taskbar.fragment.SelectAppFragment;
 import com.farmerbb.taskbar.util.Blacklist;
@@ -95,9 +98,12 @@ public class SelectAppActivity extends AppCompatActivity {
                 WindowManager.LayoutParams params = getWindow().getAttributes();
                 params.dimAmount = 0;
                 getWindow().setAttributes(params);
+
+                if(U.isChromeOs(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1)
+                    getWindow().setElevation(0);
             }
 
-            progressBar = (ProgressBar) findViewById(R.id.progress_bar);
+            progressBar = findViewById(R.id.progress_bar);
             appListGenerator = new AppListGenerator();
             appListGenerator.execute();
         } else {
@@ -105,7 +111,21 @@ public class SelectAppActivity extends AppCompatActivity {
             finish();
 
             if(!noShadow)
-                new Handler().post(() -> startActivity(new Intent(SelectAppActivity.this, SelectAppActivity.class)));
+                new Handler().post(() -> {
+                    Intent intent = null;
+                    SharedPreferences pref3 = U.getSharedPreferences(this);
+
+                    switch(pref3.getString("theme", "light")) {
+                        case "light":
+                            intent = new Intent(this, SelectAppActivity.class);
+                            break;
+                        case "dark":
+                            intent = new Intent(this, SelectAppActivityDark.class);
+                            break;
+                    }
+
+                    startActivity(intent);
+                });
         }
     }
 
@@ -215,10 +235,10 @@ public class SelectAppActivity extends AppCompatActivity {
             topAppsAdapter = adapters[U.TOP_APPS];
 
             SelectAppPagerAdapter pagerAdapter = new SelectAppPagerAdapter(getSupportFragmentManager());
-            ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
+            ViewPager viewPager = findViewById(R.id.pager);
             viewPager.setAdapter(pagerAdapter);
 
-            TabLayout tabLayout = (TabLayout) findViewById(R.id.sliding_tabs);
+            TabLayout tabLayout = findViewById(R.id.sliding_tabs);
             tabLayout.setupWithViewPager(viewPager);
 
             findViewById(R.id.configure_start_menu_layout).setVisibility(View.VISIBLE);