Merge branch 'dev' of https://github.com/iSoron/uhabits into dev

android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.kt

@@ -95,7 +95,7 @@ open class AndroidBugReporter @Inject constructor(@AppContext private val contex
             appendln("App Version Name: ${BuildConfig.VERSION_NAME}")
             appendln("App Version Code: ${BuildConfig.VERSION_CODE}")
             appendln("OS Version: ${System.getProperty("os.version")} (${Build.VERSION.INCREMENTAL})")
-            appendln("OS API Level: ${Build.VERSION.SDK}")
+            appendln("OS API Level: ${Build.VERSION.SDK_INT}")
             appendln("Device: ${Build.DEVICE}")
             appendln("Model (Product): ${Build.MODEL} (${Build.PRODUCT})")
             appendln("Manufacturer: ${Build.MANUFACTURER}")

android/android-base/src/main/java/org/isoron/androidbase/AppContext.kt

@@ -18,12 +18,9 @@
  */
 package org.isoron.androidbase
 
-import java.lang.annotation.Documented
-import java.lang.annotation.Retention
-import java.lang.annotation.RetentionPolicy
 import javax.inject.Qualifier
 
 @Qualifier
-@Documented
+@MustBeDocumented
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(AnnotationRetention.RUNTIME)
 annotation class AppContext

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java

@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.androidbase.activities;
-
-import android.content.*;
-import android.os.*;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.*;
-import android.view.*;
-
-import org.isoron.androidbase.*;
-
-import static android.R.anim.fade_in;
-import static android.R.anim.fade_out;
-
-/**
- * Base class for all activities in the application.
- * <p>
- * This class delegates the responsibilities of an Android activity to other
- * classes. For example, callbacks related to menus are forwarded to a {@link
- * BaseMenu}, while callbacks related to activity results are forwarded to a
- * {@link BaseScreen}.
- * <p>
- * A BaseActivity also installs an {@link java.lang.Thread.UncaughtExceptionHandler}
- * to the main thread. By default, this handler is an instance of
- * BaseExceptionHandler, which logs the exception to the disk before the application
- * crashes. To the default handler, you should override the method
- * getExceptionHandler.
- */
-abstract public class BaseActivity extends AppCompatActivity
-{
-    @Nullable
-    private BaseMenu baseMenu;
-
-    @Nullable
-    private BaseScreen screen;
-
-    @Override
-    public boolean onCreateOptionsMenu(@Nullable Menu menu)
-    {
-        if (menu == null) return true;
-        if (baseMenu == null) return true;
-        baseMenu.onCreate(getMenuInflater(), menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@Nullable MenuItem item)
-    {
-        if (item == null) return false;
-        if (baseMenu == null) return false;
-        return baseMenu.onItemSelected(item);
-    }
-
-    public void restartWithFade(Class<?> cls)
-    {
-        new Handler().postDelayed(() ->
-        {
-            finish();
-            overridePendingTransition(fade_in, fade_out);
-            startActivity(new Intent(this, cls));
-
-        }, 500); // HACK: Let the menu disappear first
-    }
-
-    public void setBaseMenu(@Nullable BaseMenu baseMenu)
-    {
-        this.baseMenu = baseMenu;
-    }
-
-    public void setScreen(@Nullable BaseScreen screen)
-    {
-        this.screen = screen;
-    }
-
-    public void showDialog(AppCompatDialogFragment dialog, String tag)
-    {
-        dialog.show(getSupportFragmentManager(), tag);
-    }
-
-    public void showDialog(AppCompatDialog dialog)
-    {
-        dialog.show();
-    }
-
-    @Override
-    protected void onActivityResult(int request, int result, Intent data)
-    {
-        if (screen == null) super.onActivityResult(request, result, data);
-        else screen.onResult(request, result, data);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        Thread.setDefaultUncaughtExceptionHandler(getExceptionHandler());
-    }
-
-    protected Thread.UncaughtExceptionHandler getExceptionHandler()
-    {
-        return new BaseExceptionHandler(this);
-    }
-
-    @Override
-    protected void onResume()
-    {
-        super.onResume();
-        if(screen != null) screen.reattachDialogs();
-    }
-}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.kt

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.isoron.androidbase.activities
+
+import android.R.anim
+import android.content.*
+import android.os.*
+import android.view.*
+import androidx.appcompat.app.*
+import org.isoron.androidbase.*
+
+/**
+ * Base class for all activities in the application.
+ *
+ * This class delegates the responsibilities of an Android activity to other classes. For example,
+ * callbacks related to menus are forwarded to a []BaseMenu], while callbacks related to activity
+ * results are forwarded to a [BaseScreen].
+ *
+ *
+ * A BaseActivity also installs an [java.lang.Thread.UncaughtExceptionHandler] to the main thread.
+ * By default, this handler is an instance of BaseExceptionHandler, which logs the exception to the
+ * disk before the application crashes. To the default handler, you should override the method
+ * getExceptionHandler.
+ */
+abstract class BaseActivity : AppCompatActivity() {
+    private var baseMenu: BaseMenu? = null
+    private var screen: BaseScreen? = null
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        if (menu != null) baseMenu?.onCreate(menuInflater, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        if (item == null) return false
+        return baseMenu?.onItemSelected(item) ?: false
+    }
+
+    fun restartWithFade(cls: Class<*>?) {
+        Handler().postDelayed({
+            finish()
+            overridePendingTransition(anim.fade_in, anim.fade_out)
+            startActivity(Intent(this, cls))
+        }, 500) // HACK: Let the menu disappear first
+    }
+
+    fun setBaseMenu(baseMenu: BaseMenu?) {
+        this.baseMenu = baseMenu
+    }
+
+    fun setScreen(screen: BaseScreen?) {
+        this.screen = screen
+    }
+
+    fun showDialog(dialog: AppCompatDialogFragment, tag: String?) {
+        dialog.show(supportFragmentManager, tag)
+    }
+
+    fun showDialog(dialog: AppCompatDialog) {
+        dialog.show()
+    }
+
+    override fun onActivityResult(request: Int, result: Int, data: Intent?) {
+        val screen = screen
+        if(screen == null) super.onActivityResult(request, result, data)
+        else screen.onResult(request, result, data)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Thread.setDefaultUncaughtExceptionHandler(getExceptionHandler())
+    }
+
+    private fun getExceptionHandler() = BaseExceptionHandler(this)
+
+    override fun onResume() {
+        super.onResume()
+        screen?.reattachDialogs()
+    }
+
+    override fun startActivity(intent: Intent?) {
+        try {
+            super.startActivity(intent)
+        } catch(e: ActivityNotFoundException) {
+            this.screen?.showMessage(R.string.activity_not_found)
+        }
+    }
+}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.kt

@@ -16,71 +16,50 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+package org.isoron.androidbase.activities
 
-package org.isoron.androidbase.activities;
+import android.view.*
-
+import androidx.annotation.*
-import android.view.*;
-
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
 
 /**
  * Base class for all the menus in the application.
- * <p>
+ *
  * This class receives from BaseActivity all callbacks related to menus, such as
  * menu creation and click events. It also handles some implementation details
  * of creating menus in Android, such as inflating the resources.
  */
-public abstract class BaseMenu
+abstract class BaseMenu(private val activity: BaseActivity) {
-{
-    @NonNull
-    private final BaseActivity activity;
-
-    public BaseMenu(@NonNull BaseActivity activity)
-    {
-        this.activity = activity;
-    }
-
-    @NonNull
-    public BaseActivity getActivity()
-    {
-        return activity;
-    }
 
     /**
      * Declare that the menu has changed, and should be recreated.
      */
-    public void invalidate()
+    fun invalidate() {
-    {
+        activity.invalidateOptionsMenu()
-        activity.invalidateOptionsMenu();
     }
 
     /**
      * Called when the menu is first displayed.
-     * <p>
+     *
      * The given menu is already inflated and ready to receive items. The
      * application should override this method and add items to the menu here.
      *
      * @param menu the menu that is being created.
      */
-    public void onCreate(@NonNull Menu menu)
+    open fun onCreate(menu: Menu) {}
-    {
-    }
 
     /**
      * Called when the menu is first displayed.
-     * <p>
+     *
      * This method should not be overridden. The application should override
      * the methods onCreate(Menu) and getMenuResourceId instead.
      *
      * @param inflater a menu inflater, for creating the menu
      * @param menu     the menu that is being created.
      */
-    public void onCreate(@NonNull MenuInflater inflater, @NonNull Menu menu)
+    fun onCreate(inflater: MenuInflater, menu: Menu) {
-    {
+        menu.clear()
-        menu.clear();
+        inflater.inflate(getMenuResourceId(), menu)
-        inflater.inflate(getMenuResourceId(), menu);
+        onCreate(menu)
-        onCreate(menu);
     }
 
     /**
@@ -89,10 +68,7 @@ public abstract class BaseMenu
      * @param item the item that was selected.
      * @return true if the event was consumed, or false otherwise
      */
-    public boolean onItemSelected(@NonNull MenuItem item)
+    open fun onItemSelected(item: MenuItem): Boolean = false
-    {
-        return false;
-    }
 
     /**
      * Returns the id of the resource that should be used to inflate this menu.
@@ -100,5 +76,6 @@ public abstract class BaseMenu
      * @return id of the menu resource.
      */
     @MenuRes
-    protected abstract int getMenuResourceId();
+    protected abstract fun getMenuResourceId(): Int
-}
+
+}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java

@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.androidbase.activities;
-
-import android.content.*;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import android.view.*;
-import android.widget.*;
-
-import org.isoron.androidbase.*;
-import org.isoron.androidbase.utils.*;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
-
-/**
- * Base class for all root views in the application.
- * <p>
- * A root view is an Android view that is directly attached to an activity. This
- * view usually includes a toolbar and a progress bar. This abstract class hides
- * some of the complexity of setting these things up, for every version of
- * Android.
- */
-public abstract class BaseRootView extends FrameLayout
-{
-    @NonNull
-    private final Context context;
-
-    protected boolean shouldDisplayHomeAsUp = false;
-
-    @Nullable
-    private BaseScreen screen;
-
-    public BaseRootView(@NonNull Context context)
-    {
-        super(context);
-        this.context = context;
-    }
-
-    public boolean getDisplayHomeAsUp()
-    {
-        return shouldDisplayHomeAsUp;
-    }
-
-    public void setDisplayHomeAsUp(boolean b)
-    {
-        shouldDisplayHomeAsUp = b;
-    }
-
-    @NonNull
-    public Toolbar getToolbar()
-    {
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        if (toolbar == null) throw new RuntimeException(
-            "Your BaseRootView should have a " +
-            "toolbar with id R.id.toolbar");
-        return toolbar;
-    }
-
-    public int getToolbarColor()
-    {
-        StyledResources res = new StyledResources(context);
-        return res.getColor(R.attr.colorPrimary);
-    }
-
-    protected void initToolbar()
-    {
-        if (SDK_INT >= LOLLIPOP)
-        {
-            getToolbar().setElevation(InterfaceUtils.dpToPixels(context, 2));
-
-            View view = findViewById(R.id.toolbarShadow);
-            if (view != null) view.setVisibility(GONE);
-
-            view = findViewById(R.id.headerShadow);
-            if (view != null) view.setVisibility(GONE);
-        }
-    }
-
-    public void onAttachedToScreen(BaseScreen screen)
-    {
-        this.screen = screen;
-    }
-
-    @Nullable
-    public BaseScreen getScreen()
-    {
-        return screen;
-    }
-}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.isoron.androidbase.activities
+
+import android.content.Context
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
+import android.view.View
+import android.widget.FrameLayout
+import androidx.appcompat.widget.Toolbar
+import org.isoron.androidbase.R
+import org.isoron.androidbase.utils.InterfaceUtils.dpToPixels
+import org.isoron.androidbase.utils.StyledResources
+
+/**
+ * Base class for all root views in the application.
+ *
+ *
+ * A root view is an Android view that is directly attached to an activity. This
+ * view usually includes a toolbar and a progress bar. This abstract class hides
+ * some of the complexity of setting these things up, for every version of
+ * Android.
+ */
+abstract class BaseRootView(context: Context) : FrameLayout(context) {
+    var displayHomeAsUp = false
+    var screen: BaseScreen? = null
+        private set
+
+    open fun getToolbar(): Toolbar {
+        return findViewById(R.id.toolbar)
+                ?: throw RuntimeException("Your BaseRootView should have a toolbar with id R.id.toolbar")
+    }
+
+    open fun getToolbarColor(): Int = StyledResources(context).getColor(R.attr.colorPrimary)
+
+    protected open fun initToolbar() {
+        if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+            getToolbar().elevation = dpToPixels(context, 2f)
+            findViewById<View>(R.id.toolbarShadow)?.visibility = View.GONE
+            findViewById<View>(R.id.headerShadow)?.visibility = View.GONE
+        }
+    }
+
+    fun onAttachedToScreen(screen: BaseScreen?) {
+        this.screen = screen
+    }
+}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java

@@ -1,318 +0,0 @@
-/*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.androidbase.activities;
-
-import android.content.*;
-import android.graphics.*;
-import android.graphics.drawable.*;
-import android.net.*;
-import android.os.*;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.core.content.res.*;
-import androidx.appcompat.app.*;
-import androidx.appcompat.view.ActionMode;
-import androidx.appcompat.widget.Toolbar;
-import android.view.*;
-import android.widget.*;
-
-import com.google.android.material.snackbar.Snackbar;
-
-import org.isoron.androidbase.*;
-import org.isoron.androidbase.utils.*;
-
-import java.io.*;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
-import static androidx.core.content.FileProvider.getUriForFile;
-
-/**
- * Base class for all screens in the application.
- * <p>
- * Screens are responsible for deciding what root views and what menus should be
- * attached to the main window. They are also responsible for showing other
- * screens and for receiving their results.
- */
-public class BaseScreen
-{
-    protected BaseActivity activity;
-
-    @Nullable
-    private BaseRootView rootView;
-
-    @Nullable
-    private BaseSelectionMenu selectionMenu;
-
-    protected Snackbar snackbar;
-
-    public BaseScreen(@NonNull BaseActivity activity)
-    {
-        this.activity = activity;
-    }
-
-    @Deprecated
-    public static int getDefaultActionBarColor(Context context)
-    {
-        if (SDK_INT < LOLLIPOP)
-        {
-            return ResourcesCompat.getColor(context.getResources(),
-                R.color.grey_900, context.getTheme());
-        }
-        else
-        {
-            StyledResources res = new StyledResources(context);
-            return res.getColor(R.attr.colorPrimary);
-        }
-    }
-
-    @Deprecated
-    public static void setupActionBarColor(@NonNull AppCompatActivity activity,
-                                           int color)
-    {
-
-        Toolbar toolbar = (Toolbar) activity.findViewById(R.id.toolbar);
-        if (toolbar == null) return;
-
-        activity.setSupportActionBar(toolbar);
-
-        ActionBar actionBar = activity.getSupportActionBar();
-        if (actionBar == null) return;
-
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
-        ColorDrawable drawable = new ColorDrawable(color);
-        actionBar.setBackgroundDrawable(drawable);
-
-        if (SDK_INT >= LOLLIPOP)
-        {
-            int darkerColor = ColorUtils.mixColors(color, Color.BLACK, 0.75f);
-            activity.getWindow().setStatusBarColor(darkerColor);
-
-            toolbar.setElevation(InterfaceUtils.dpToPixels(activity, 2));
-
-            View view = activity.findViewById(R.id.toolbarShadow);
-            if (view != null) view.setVisibility(View.GONE);
-
-            view = activity.findViewById(R.id.headerShadow);
-            if (view != null) view.setVisibility(View.GONE);
-        }
-    }
-
-    /**
-     * Notifies the screen that its contents should be updated.
-     */
-    public void invalidate()
-    {
-        if (rootView == null) return;
-        rootView.invalidate();
-    }
-
-    public void invalidateToolbar()
-    {
-        if (rootView == null) return;
-
-        activity.runOnUiThread(() ->
-        {
-            Toolbar toolbar = rootView.getToolbar();
-            activity.setSupportActionBar(toolbar);
-            ActionBar actionBar = activity.getSupportActionBar();
-            if (actionBar == null) return;
-
-            actionBar.setDisplayHomeAsUpEnabled(rootView.getDisplayHomeAsUp());
-
-            int color = rootView.getToolbarColor();
-            setActionBarColor(actionBar, color);
-            setStatusBarColor(color);
-        });
-    }
-
-    /**
-     * Called when another Activity has finished, and has returned some result.
-     *
-     * @param requestCode the request code originally supplied to {@link
-     *                    android.app.Activity#startActivityForResult(Intent,
-     *                    int, Bundle)}.
-     * @param resultCode  the result code sent by the other activity.
-     * @param data        an Intent containing extra data sent by the other
-     *                    activity.
-     * @see {@link android.app.Activity#onActivityResult(int, int, Intent)}
-     */
-    public void onResult(int requestCode, int resultCode, Intent data)
-    {
-    }
-
-
-    /**
-     * Called after activity has been recreated, and the dialogs should be
-     * reattached to their controllers.
-     */
-    public void reattachDialogs()
-    {
-    }
-
-    /**
-     * Sets the menu to be shown by this screen.
-     * <p>
-     * This menu will be visible if when there is no active selection operation.
-     * If the provided menu is null, then no menu will be shown.
-     *
-     * @param menu the menu to be shown.
-     */
-    public void setMenu(@Nullable BaseMenu menu)
-    {
-        activity.setBaseMenu(menu);
-    }
-
-    /**
-     * Sets the root view for this screen.
-     *
-     * @param rootView the root view for this screen.
-     */
-    public void setRootView(@Nullable BaseRootView rootView)
-    {
-        this.rootView = rootView;
-        activity.setContentView(rootView);
-        if (rootView == null) return;
-        rootView.onAttachedToScreen(this);
-        invalidateToolbar();
-    }
-
-    /**
-     * Sets the menu to be shown when a selection is active on the screen.
-     *
-     * @param menu the menu to be shown during a selection
-     */
-    public void setSelectionMenu(@Nullable BaseSelectionMenu menu)
-    {
-        this.selectionMenu = menu;
-    }
-
-    /**
-     * Shows a message on the screen.
-     *
-     * @param stringId the string resource id for this message.
-     */
-    public void showMessage(@StringRes Integer stringId)
-    {
-        if (stringId == null || rootView == null) return;
-        if (snackbar == null)
-        {
-            snackbar = Snackbar.make(rootView, stringId, Snackbar.LENGTH_SHORT);
-            int tvId = R.id.snackbar_text;
-            TextView tv = (TextView) snackbar.getView().findViewById(tvId);
-            tv.setTextColor(Color.WHITE);
-        }
-        else snackbar.setText(stringId);
-        snackbar.show();
-    }
-
-    public void showSendEmailScreen(@StringRes int toId,
-                                    @StringRes int subjectId,
-                                    String content)
-    {
-        String to = activity.getString(toId);
-        String subject = activity.getString(subjectId);
-
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_SEND);
-        intent.setType("message/rfc822");
-        intent.putExtra(Intent.EXTRA_EMAIL, new String[]{ to });
-        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        intent.putExtra(Intent.EXTRA_TEXT, content);
-        activity.startActivity(intent);
-    }
-
-    public void showSendFileScreen(@NonNull String archiveFilename)
-    {
-        File file = new File(archiveFilename);
-        Uri fileUri = getUriForFile(activity, "org.isoron.uhabits", file);
-
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_SEND);
-        intent.setType("application/zip");
-        intent.putExtra(Intent.EXTRA_STREAM, fileUri);
-        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        activity.startActivity(intent);
-    }
-
-    /**
-     * Instructs the screen to start a selection.
-     * <p>
-     * If a selection menu was provided, this menu will be shown instead of the
-     * regular one.
-     */
-    public void startSelection()
-    {
-        activity.startSupportActionMode(new ActionModeWrapper());
-    }
-
-    private void setActionBarColor(@NonNull ActionBar actionBar, int color)
-    {
-        ColorDrawable drawable = new ColorDrawable(color);
-        actionBar.setBackgroundDrawable(drawable);
-    }
-
-    private void setStatusBarColor(int baseColor)
-    {
-        if (SDK_INT < LOLLIPOP) return;
-
-        int darkerColor = ColorUtils.mixColors(baseColor, Color.BLACK, 0.75f);
-        activity.getWindow().setStatusBarColor(darkerColor);
-    }
-
-    private class ActionModeWrapper implements ActionMode.Callback
-    {
-        @Override
-        public boolean onActionItemClicked(@Nullable ActionMode mode,
-                                           @Nullable MenuItem item)
-        {
-            if (item == null || selectionMenu == null) return false;
-            return selectionMenu.onItemClicked(item);
-        }
-
-        @Override
-        public boolean onCreateActionMode(@Nullable ActionMode mode,
-                                          @Nullable Menu menu)
-        {
-            if (selectionMenu == null) return false;
-            if (mode == null || menu == null) return false;
-            selectionMenu.onCreate(activity.getMenuInflater(), mode, menu);
-            return true;
-        }
-
-        @Override
-        public void onDestroyActionMode(@Nullable ActionMode mode)
-        {
-            if (selectionMenu == null) return;
-            selectionMenu.onFinish();
-        }
-
-        @Override
-        public boolean onPrepareActionMode(@Nullable ActionMode mode,
-                                           @Nullable Menu menu)
-        {
-            if (selectionMenu == null || menu == null) return false;
-            return selectionMenu.onPrepare(menu);
-        }
-    }
-}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.kt

@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.isoron.androidbase.activities
+
+import android.content.*
+import android.graphics.*
+import android.graphics.drawable.*
+import android.view.*
+import android.widget.*
+import androidx.annotation.*
+import androidx.appcompat.app.*
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.*
+import com.google.android.material.snackbar.*
+import org.isoron.androidbase.*
+import org.isoron.androidbase.utils.*
+import org.isoron.androidbase.utils.ColorUtils.mixColors
+import org.isoron.androidbase.utils.InterfaceUtils.dpToPixels
+import java.io.*
+
+/**
+ * Base class for all screens in the application.
+ *
+ * Screens are responsible for deciding what root views and what menus should be attached to the
+ * main window. They are also responsible for showing other screens and for receiving their results.
+ */
+open class BaseScreen(@JvmField protected var activity: BaseActivity) {
+
+    private var rootView: BaseRootView? = null
+    private var selectionMenu: BaseSelectionMenu? = null
+    private var snackbar: Snackbar? = null
+
+    /**
+     * Notifies the screen that its contents should be updated.
+     */
+    fun invalidate() {
+        rootView?.invalidate()
+    }
+
+    fun invalidateToolbar() {
+        rootView?.let { root ->
+            activity.runOnUiThread {
+                val toolbar = root.getToolbar()
+                activity.setSupportActionBar(toolbar)
+                activity.supportActionBar?.let { actionBar ->
+                    actionBar.setDisplayHomeAsUpEnabled(root.displayHomeAsUp)
+                    val color = root.getToolbarColor()
+                    setActionBarColor(actionBar, color)
+                    setStatusBarColor(color)
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when another Activity has finished, and has returned some result.
+     *
+     * @param requestCode the request code originally supplied to startActivityForResult.
+     * @param resultCode  the result code sent by the other activity.
+     * @param data        an Intent containing extra data sent by the other
+     * activity.
+     * @see {@link android.app.Activity.onActivityResult
+     */
+    open fun onResult(requestCode: Int, resultCode: Int, data: Intent?) {}
+
+    /**
+     * Called after activity has been recreated, and the dialogs should be
+     * reattached to their controllers.
+     */
+    open fun reattachDialogs() {}
+
+    /**
+     * Sets the menu to be shown by this screen.
+     *
+     *
+     * This menu will be visible if when there is no active selection operation.
+     * If the provided menu is null, then no menu will be shown.
+     *
+     * @param menu the menu to be shown.
+     */
+    fun setMenu(menu: BaseMenu?) {
+        activity.setBaseMenu(menu)
+    }
+
+    /**
+     * Sets the root view for this screen.
+     *
+     * @param rootView the root view for this screen.
+     */
+    fun setRootView(rootView: BaseRootView?) {
+        this.rootView = rootView
+        activity.setContentView(rootView)
+        rootView?.let {
+            it.onAttachedToScreen(this)
+            invalidateToolbar()
+        }
+    }
+
+    /**
+     * Sets the menu to be shown when a selection is active on the screen.
+     *
+     * @param menu the menu to be shown during a selection
+     */
+    fun setSelectionMenu(menu: BaseSelectionMenu?) {
+        selectionMenu = menu
+    }
+
+    /**
+     * Shows a message on the screen.
+     *
+     * @param stringId the string resource id for this message.
+     */
+    fun showMessage(@StringRes stringId: Int?) {
+        val rootView = this.rootView
+        var snackbar = this.snackbar
+        if (stringId == null || rootView == null) return
+        if (snackbar == null) {
+            snackbar = Snackbar.make(rootView, stringId, Snackbar.LENGTH_SHORT)
+            val tvId = R.id.snackbar_text
+            val tv = snackbar.view.findViewById<TextView>(tvId)
+            tv.setTextColor(Color.WHITE)
+            this.snackbar = snackbar
+        }
+        snackbar.setText(stringId)
+        snackbar.show()
+    }
+
+    fun showSendEmailScreen(@StringRes toId: Int, @StringRes subjectId: Int, content: String?) {
+        val to = activity.getString(toId)
+        val subject = activity.getString(subjectId)
+        activity.startActivity(Intent().apply {
+            action = Intent.ACTION_SEND
+            type = "message/rfc822"
+            putExtra(Intent.EXTRA_EMAIL, arrayOf(to))
+            putExtra(Intent.EXTRA_SUBJECT, subject)
+            putExtra(Intent.EXTRA_TEXT, content)
+        })
+    }
+
+    fun showSendFileScreen(archiveFilename: String) {
+        val file = File(archiveFilename)
+        val fileUri = FileProvider.getUriForFile(activity, "org.isoron.uhabits", file)
+        activity.startActivity(Intent().apply {
+            action = Intent.ACTION_SEND
+            type = "application/zip"
+            putExtra(Intent.EXTRA_STREAM, fileUri)
+            flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+        })
+    }
+
+    /**
+     * Instructs the screen to start a selection.
+     *
+     * If a selection menu was provided, this menu will be shown instead of the regular one.
+     */
+    fun startSelection() {
+        activity.startSupportActionMode(ActionModeWrapper())
+    }
+
+    private fun setActionBarColor(actionBar: ActionBar, color: Int) {
+        val drawable = ColorDrawable(color)
+        actionBar.setBackgroundDrawable(drawable)
+    }
+
+    private fun setStatusBarColor(baseColor: Int) {
+        val darkerColor = mixColors(baseColor, Color.BLACK, 0.75f)
+        activity.window.statusBarColor = darkerColor
+    }
+
+    private inner class ActionModeWrapper : ActionMode.Callback {
+        override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+            val selectionMenu = selectionMenu
+            if (item == null || selectionMenu == null) return false
+            return selectionMenu.onItemClicked(item)
+        }
+
+        override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+            if (mode == null || menu == null) return false
+            val selectionMenu = selectionMenu ?: return false
+            selectionMenu.onCreate(activity.menuInflater, mode, menu)
+            return true
+        }
+
+        override fun onDestroyActionMode(mode: ActionMode?) {
+            selectionMenu?.onFinish()
+        }
+
+        override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+            val selectionMenu = selectionMenu
+            if (selectionMenu == null || menu == null) return false
+            return selectionMenu.onPrepare(menu)
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        @Deprecated("")
+        fun getDefaultActionBarColor(context: Context) =
+                StyledResources(context).getColor(R.attr.colorPrimary)
+
+        @JvmStatic
+        @Deprecated("")
+        fun setupActionBarColor(activity: AppCompatActivity, color: Int) {
+            val toolbar = activity.findViewById<Toolbar>(R.id.toolbar) ?: return
+            activity.setSupportActionBar(toolbar)
+            val supportActionBar = activity.supportActionBar ?: return
+            supportActionBar.setDisplayHomeAsUpEnabled(true)
+            val drawable = ColorDrawable(color)
+            supportActionBar.setBackgroundDrawable(drawable)
+            val darkerColor = mixColors(color, Color.BLACK, 0.75f)
+            activity.window.statusBarColor = darkerColor
+            toolbar.elevation = dpToPixels(activity, 2f)
+            activity.findViewById<View>(R.id.toolbarShadow)?.visibility = View.GONE
+            activity.findViewById<View>(R.id.headerShadow)?.visibility = View.GONE
+        }
+    }
+}

android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.kt

@@ -16,50 +16,43 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+package org.isoron.androidbase.activities
 
-package org.isoron.androidbase.activities;
+import android.view.*
-
+import androidx.appcompat.view.ActionMode
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.view.ActionMode;
-import android.view.*;
 
 /**
  * Base class for all the selection menus in the application.
- * <p>
+ *
  * A selection menu is a menu that appears when the screen starts a selection
  * operation. It contains actions that modify the selected items, such as delete
  * or archive. Since it replaces the toolbar, it also has a title.
- * <p>
+ *
  * This class hides many implementation details of creating such menus in
- * Android. The interface is supposed to look very similar to {@link BaseMenu},
+ * Android. The interface is supposed to look very similar to [BaseMenu],
  * with a few additional methods, such as finishing the selection operation.
- * Internally, it uses an {@link ActionMode}.
+ * Internally, it uses an [ActionMode].
  */
-public abstract class BaseSelectionMenu
+abstract class BaseSelectionMenu {
-{
+    private var actionMode: ActionMode? = null
-    @Nullable
-    private ActionMode actionMode;
 
     /**
      * Finishes the selection operation.
      */
-    public void finish()
+    fun finish() {
-    {
+        actionMode?.finish()
-        if (actionMode != null) actionMode.finish();
     }
 
     /**
      * Declare that the menu has changed, and should be recreated.
      */
-    public void invalidate()
+    fun invalidate() {
-    {
+        actionMode?.invalidate()
-        if (actionMode != null) actionMode.invalidate();
     }
 
     /**
      * Called when the menu is first displayed.
-     * <p>
+     *
      * This method should not be overridden. The application should override
      * the methods onCreate(Menu) and getMenuResourceId instead.
      *
@@ -67,22 +60,16 @@ public abstract class BaseSelectionMenu
      * @param mode     the action mode associated with this menu.
      * @param menu     the menu that is being created.
      */
-    public void onCreate(@NonNull MenuInflater inflater,
+    fun onCreate(inflater: MenuInflater, mode: ActionMode, menu: Menu) {
-                         @NonNull ActionMode mode,
+        actionMode = mode
-                         @NonNull Menu menu)
+        inflater.inflate(getResourceId(), menu)
-    {
+        onCreate(menu)
-        this.actionMode = mode;
-        inflater.inflate(getResourceId(), menu);
-        onCreate(menu);
     }
 
     /**
      * Called when the selection operation is about to finish.
      */
-    public void onFinish()
+    open fun onFinish() {}
-    {
-
-    }
 
     /**
      * Called whenever an item on the menu is selected.
@@ -90,11 +77,7 @@ public abstract class BaseSelectionMenu
      * @param item the item that was selected.
      * @return true if the event was consumed, or false otherwise
      */
-    public boolean onItemClicked(@NonNull MenuItem item)
+    open fun onItemClicked(item: MenuItem): Boolean = false
-    {
-        return false;
-    }
-
 
     /**
      * Called whenever the menu is invalidated.
@@ -102,29 +85,23 @@ public abstract class BaseSelectionMenu
      * @param menu the menu to be refreshed
      * @return true if the menu has changes, false otherwise
      */
-    public boolean onPrepare(@NonNull Menu menu)
+    open fun onPrepare(menu: Menu): Boolean = false
-    {
-        return false;
-    }
 
     /**
      * Sets the title of the selection menu.
      *
      * @param title the new title.
      */
-    public void setTitle(String title)
+    fun setTitle(title: String?) {
-    {
+        actionMode?.title = title
-        if (actionMode != null) actionMode.setTitle(title);
     }
 
-    protected abstract int getResourceId();
+    protected abstract fun getResourceId(): Int
 
     /**
      * Called when the menu is first created.
      *
      * @param menu the menu being created
      */
-    protected void onCreate(@NonNull Menu menu)
+    protected fun onCreate(menu: Menu) {}
-    {
+}
-    }
-}

android/android-base/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2020 Álinson Santos Xavier <isoron@gmail.com>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -18,13 +18,6 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<resources>
-    android:layout_width="match_parent"
+    <string name="activity_not_found">No app was found to support this action</string>
-    android:layout_height="match_parent"
+</resources>
-    android:orientation="vertical">
-
-    <org.isoron.uhabits.activities.habits.show.views.TargetCard
-        android:id="@+id/targetCard"
-        style="@style/Card"
-        android:gravity="center"/>
-</LinearLayout>

android/build.sh

@@ -71,12 +71,12 @@ build_apk() {
 
     if [ ! -z $RELEASE ]; then
         log_info "Building release APK"
-        ./gradlew assembleRelease
+        $GRADLE assembleRelease
         cp -v uhabits-android/build/outputs/apk/release/uhabits-android-release.apk build/loop-$VERSION-release.apk
     fi
 
     log_info "Building debug APK"
-    ./gradlew assembleDebug --stacktrace || fail
+    $GRADLE assembleDebug --stacktrace || fail
     cp -v uhabits-android/build/outputs/apk/debug/uhabits-android-debug.apk build/loop-$VERSION-debug.apk
 }
 

android/gradle.properties

@@ -1,5 +1,5 @@
-VERSION_CODE = 51
+VERSION_CODE = 52
-VERSION_NAME = 1.8.8
+VERSION_NAME = 1.8.9
 
 MIN_SDK_VERSION = 21
 TARGET_SDK_VERSION = 29