Popups, BDialog flags, Small ui changes, New Updating Mechanism (via releases)

Author: UriahShaulMandel

apks/app-release.apk

@@ -1 +1,2 @@
-75@@@11.2.0@@@Fixed Bug in Alarms
+76@@@11.3.0@@@ # Introducing Popups!
+ # Small UI changes

apks/last_release.txt

@@ -27,8 +27,8 @@ android {
         applicationId "com.bald.uriah.baldphone"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 75
-        versionName "11.2.0"
+        versionCode 76
+        versionName "11.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -60,8 +60,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0-alpha05'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha05'
+    androidTestImplementation 'androidx.test:runner:1.2.0-beta01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.1.0-alpha05'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
@@ -73,5 +73,6 @@ dependencies {
     implementation 'com.android.volley:volley:1.1.1'
     implementation "ch.acra:acra-http:5.3.0"
     implementation 'androidx.exifinterface:exifinterface:1.1.0-alpha01'
-    implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:10.0.3' //for adding pic to contact
+    implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:10.0.3'
+    androidTestImplementation 'androidx.test:rules:1.2.0-beta01'//for adding pic to contact
 }

app/build.gradle

@@ -19,20 +19,15 @@
 
 package com.bald.uriah.baldphone.activities;
 
-import android.animation.ValueAnimator;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.graphics.Point;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.content.ContextCompat;
+import android.widget.PopupWindow;
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bald.uriah.baldphone.R;
@@ -42,9 +37,12 @@
 import com.bald.uriah.baldphone.databases.apps.AppsDatabaseHelper;
 import com.bald.uriah.baldphone.utils.BDB;
 import com.bald.uriah.baldphone.utils.BDialog;
+import com.bald.uriah.baldphone.utils.DropDownRecyclerViewAdapter;
 import com.bald.uriah.baldphone.utils.S;
+import com.bumptech.glide.Glide;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.bald.uriah.baldphone.adapters.AppsRecyclerViewAdapter.TYPE_HEADER;
 
@@ -55,19 +53,11 @@ public class AppsActivity extends com.bald.uriah.baldphone.activities.BaldActivi
     public static final int UNINSTALL_REQUEST_CODE = 52;
     private static final String TAG = AppsActivity.class.getSimpleName();
     private static final String SELECTED_APP_INDEX = "SELECTED_APP_INDEX";
-    private static final int TIME_FOR_EFFECT = 300;
-    private int lastIndex = -1;
 
     //"finals"
     private AppsDatabase appsDatabase;
-    private Drawable drawablePin, drawableRemPin;
     private int numberOfAppsInARow;
-    private int barHeight;
 
-    //views
-    private View bar, pin, open, uninstall;
-    private TextView tv_add_or_rem_shortcut;
-    private ImageView iv_pin;
     private RecyclerView recyclerView;
 
     private AppsRecyclerViewAdapter appsRecyclerViewAdapter;
@@ -79,16 +69,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         AppsDatabaseHelper.updateDB(this);
 
-        drawablePin = ContextCompat.getDrawable(this, R.drawable.add_on_button);
-        drawableRemPin = ContextCompat.getDrawable(this, R.drawable.remove_on_button);
-        barHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 120f, getResources().getDisplayMetrics());
-
         appsDatabase = AppsDatabase.getInstance(AppsActivity.this);
         final List<App> appList = appsDatabase.appsDatabaseDao().getAllOrderedByABC();
         attachXml();
 
         final boolean modeChoose = MODE_CHOOSE_ONE.equals(getIntent().getStringExtra(EXTRA_MODE));
-        appsRecyclerViewAdapter = new AppsRecyclerViewAdapter(appList, this, modeChoose ? this::appChosen : this::changeBar, recyclerView);
+        appsRecyclerViewAdapter = new AppsRecyclerViewAdapter(appList, this, modeChoose ? this::appChosen : this::showDropDown, recyclerView);
 
         final WindowManager windowManager = getWindowManager();
         final Point point = new Point();
@@ -110,57 +96,11 @@ public int getSpanSize(int position) {
             }
         });
         recyclerView.setLayoutManager(gridLayoutManager);
-
-        open.setOnClickListener(v -> {
-            if (appsRecyclerViewAdapter.index != -1) {
-                final ComponentName componentName = ComponentName.unflattenFromString(((App) appsRecyclerViewAdapter.dataList.get(appsRecyclerViewAdapter.index)).getFlattenComponentName());
-                S.startComponentName(v.getContext(), componentName);
-            }
-        });
-        pin.setOnClickListener(v -> {
-            if (appsRecyclerViewAdapter.index != -1) {
-
-                final App app = (App) appsRecyclerViewAdapter.dataList.get(appsRecyclerViewAdapter.index);
-                if (app.isPinned()) {
-                    appsDatabase.appsDatabaseDao().update(app.getId(), false);
-                    app.setPinned(false);
-                    appsRecyclerViewAdapter.notifyItemChanged(appsRecyclerViewAdapter.index);
-                    iv_pin.setImageDrawable(drawablePin);
-                    tv_add_or_rem_shortcut.setText(R.string.add_shortcut);
-                } else {
-                    appsDatabase.appsDatabaseDao().update(app.getId(), true);
-                    app.setPinned(true);
-                    appsRecyclerViewAdapter.notifyItemChanged(appsRecyclerViewAdapter.index);
-                    iv_pin.setImageDrawable(drawableRemPin);
-                    tv_add_or_rem_shortcut.setText(R.string.remove_shortcut);
-
-                }
-            }
-        });
-        uninstall.setOnClickListener(v -> {
-            final App app = (App) appsRecyclerViewAdapter.dataList.get(appsRecyclerViewAdapter.index);
-            BDB.from(this)
-                    .setTitle(getText(R.string.uninstall) + app.getLabel())
-                    .setSubText(String.format(getString(R.string.uninstall_subtext), app.getLabel(), app.getLabel()))
-                    .setDialogState(BDialog.DialogState.YES_CANCEL)
-                    .setCancelable(true)
-                    .setPositiveButtonListener(params -> {
-                        uninstallApp(app);
-                        return true;
-                    })
-                    .show();
-        });
         recyclerView.setAdapter(appsRecyclerViewAdapter);
     }
 
     private void attachXml() {
         recyclerView = findViewById(R.id.rc_apps);
-        bar = findViewById(R.id.bar);
-        pin = bar.findViewById(R.id.pin);
-        open = bar.findViewById(R.id.open);
-        uninstall = bar.findViewById(R.id.app_uninstall);
-        iv_pin = findViewById(R.id.iv_pin);
-        tv_add_or_rem_shortcut = findViewById(R.id.tv_add_or_rem_shortcut);
     }
 
     private void uninstallApp(App app) {
@@ -181,57 +121,89 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
-    private void changeBar(int index) {
-        if (lastIndex == index)
+    private void showDropDown(final int index) {
+        appsRecyclerViewAdapter.index = index;
+        final App app = (App) appsRecyclerViewAdapter.dataList.get(index);
+        final View view = Objects.requireNonNull(recyclerView.getLayoutManager()).findViewByPosition(index);
+        if (view == null)
             return;
-        lastIndex = index;
-        if (index == -1) {
-            animateBarView(false);
-        } else {
-            final App app = (App) appsRecyclerViewAdapter.dataList.get(index);
-            bar.setVisibility(View.VISIBLE);
-            animateBarView(true);
-            if (index + numberOfAppsInARow >= appsRecyclerViewAdapter.dataList.size())
-                recyclerView.scrollToPosition(index);
+        S.showDropDownPopup(this, recyclerView.getWidth(), new DropDownRecyclerViewAdapter.DropDownListener() {
+            @Override
+            public void onUpdate(DropDownRecyclerViewAdapter.ViewHolder viewHolder, int position, PopupWindow popupWindow) {
+                switch (position) {
+                    case 0:
+                        viewHolder.pic.setImageResource(R.drawable.delete_on_button);
+                        viewHolder.text.setText(R.string.uninstall);
+                        viewHolder.itemView.setOnClickListener(v1 -> {
+                            BDB.from(AppsActivity.this)
+                                    .setTitle(String.format("%s %s", getText(R.string.uninstall), app.getLabel()))
+                                    .setSubText(String.format(getString(R.string.uninstall_subtext), app.getLabel(), app.getLabel()))
+                                    .addFlag(BDialog.FLAG_YES | BDialog.FLAG_CANCEL)
+                                    .setPositiveButtonListener(params -> {
+                                        uninstallApp(app);
+                                        return true;
+                                    })
+                                    .show();
+                            popupWindow.dismiss();
+                        });
+                        break;
+                    case 1:
+                        Glide.with(viewHolder.pic).load(app.getIcon()).into(viewHolder.pic);
+                        viewHolder.text.setText(R.string.open);
+                        viewHolder.itemView.setOnClickListener(v1 -> {
+                            final ComponentName componentName = ComponentName.unflattenFromString(app.getFlattenComponentName());
+                            S.startComponentName(AppsActivity.this, componentName);
+                            popupWindow.dismiss();
+                        });
+                        break;
+                    case 2:
+                        viewHolder.pic.setImageResource(app.isPinned() ? R.drawable.remove_on_button : R.drawable.add_on_button);
+                        viewHolder.text.setText(app.isPinned() ? R.string.remove_shortcut : R.string.add_shortcut);
+                        viewHolder.itemView.setOnClickListener(v1 -> {
+                            if (app.isPinned()) {
+                                appsDatabase.appsDatabaseDao().update(app.getId(), false);
+                                app.setPinned(false);
+                                appsRecyclerViewAdapter.notifyItemChanged(appsRecyclerViewAdapter.index);
+                            } else {
+                                appsDatabase.appsDatabaseDao().update(app.getId(), true);
+                                app.setPinned(true);
+                                appsRecyclerViewAdapter.notifyItemChanged(appsRecyclerViewAdapter.index);
+                            }
+                            popupWindow.dismiss();
+                            showDropDown(index);
+                        });
+                        break;
+                }
+            }
 
-            if (app.isPinned()) {
-                tv_add_or_rem_shortcut.setText(R.string.remove_shortcut);
-                iv_pin.setImageDrawable(drawableRemPin);
-            } else {
-                iv_pin.setImageDrawable(drawablePin);
-                tv_add_or_rem_shortcut.setText(R.string.add_shortcut);
+            @Override public int size() {
+                return 3;
             }
-        }
+
+            @Override public void onDismiss() {
+                if (appsRecyclerViewAdapter.lastView != null)
+                    appsRecyclerViewAdapter.lastView.setClicked(false);
+                appsRecyclerViewAdapter.lastView = null;
+                appsRecyclerViewAdapter.index = -1;
+
+            }
+        }, view);
+
+        if (index + numberOfAppsInARow >= appsRecyclerViewAdapter.dataList.size())
+            recyclerView.scrollToPosition(index);
+
     }
 
     private void appChosen(int index) {
-        if (lastIndex == index)
-            return;
-        lastIndex = index;
-        if (index == -1) {
-            animateBarView(false);
-        } else {
+        if (index != -1) {
             final App app = (App) appsRecyclerViewAdapter.dataList.get(index);
             setResult(RESULT_OK, new Intent().setComponent(ComponentName.unflattenFromString(app.getFlattenComponentName())));
             finish();
         }
     }
 
-    public void animateBarView(boolean up) {
-        final int desiredInt = up ? barHeight : 0;
-        final ValueAnimator animator = ValueAnimator.ofInt(((ConstraintLayout.LayoutParams) bar.getLayoutParams()).height, desiredInt);
-        animator.addUpdateListener(valueAnimator -> {
-                    ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) bar.getLayoutParams();
-                    params.height = (Integer) valueAnimator.getAnimatedValue();
-                    bar.setLayoutParams(params);
-                }
-        );
-        animator.setDuration(TIME_FOR_EFFECT);
-        animator.start();
-    }
-
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(SELECTED_APP_INDEX, ((AppsRecyclerViewAdapter) recyclerView.getAdapter()).index);
     }
@@ -243,7 +215,8 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
         final AppsRecyclerViewAdapter adapter = ((AppsRecyclerViewAdapter) recyclerView.getAdapter());
         if (index < adapter.dataList.size() && index > 0 && adapter.dataList.get(index).type() != TYPE_HEADER) {
             adapter.index = index;
-            changeBar(index);
+            recyclerView.getLayoutManager().scrollToPosition(index);
+            recyclerView.post(() -> showDropDown(index));
         }
     }
 

app/src/main/java/com/bald/uriah/baldphone/activities/AppsActivity.java

@@ -220,10 +220,14 @@ public void onBackPressed() {
     }
 
     public void autoDismiss(Dialog dialog) {
+        if (dialogsToClose.size() > 10)
+            dialogsToClose = S.cleanWeakList(dialogsToClose);
         dialogsToClose.add(new WeakReference<>(dialog));
     }
 
     public void autoDismiss(PopupWindow popupWindow) {
+        if (popupWindowsToClose.size() > 10)
+            popupWindowsToClose = S.cleanWeakList(popupWindowsToClose);
         popupWindowsToClose.add(new WeakReference<>(popupWindow));
     }
 
@@ -248,8 +252,7 @@ private void accidentalTouchChecker() {
             BDB.from(this)
                     .setTitle(R.string.accidental_touches)
                     .setSubText(R.string.accidental_touches_subtext)
-                    .setDialogState(BDialog.DialogState.OK)
-                    .setCancelable(false)
+                    .addFlag(BDialog.FLAG_NOT_CANCELABLE | BDialog.FLAG_OK)
                     .setPositiveButtonListener(params -> {
                         touches = 0;
                         accidentalMinTouches += 2;
@@ -289,9 +292,4 @@ protected void setupYoutube(int index) {
 
     protected abstract int requiredPermissions();
 
-    /**
-     * @return time in milliseconds for tha activity to stay on.
-     * if it returns -1 activity will time out as set in device settings
-     */
-
 }