tweaked account selector ui
This commit is contained in:
Mariotaku Lee
parent
6c5fd5a2a1
commit
a4f3fd94f8
|
|
@ -1,7 +1,6 @@
|
|||
package org.mariotaku.microblog.library.statusnet.api;
|
||||
|
||||
import org.mariotaku.restfu.annotation.method.GET;
|
||||
import org.mariotaku.restfu.annotation.method.POST;
|
||||
import org.mariotaku.restfu.annotation.param.Path;
|
||||
import org.mariotaku.restfu.annotation.param.Query;
|
||||
import org.mariotaku.microblog.library.statusnet.model.StatusNetConfig;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ package org.mariotaku.microblog.library.twitter.api;
|
|||
import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate;
|
||||
import org.mariotaku.restfu.annotation.method.GET;
|
||||
import org.mariotaku.restfu.annotation.method.POST;
|
||||
import org.mariotaku.restfu.annotation.param.KeyValue;
|
||||
import org.mariotaku.restfu.annotation.param.Param;
|
||||
import org.mariotaku.restfu.annotation.param.Queries;
|
||||
import org.mariotaku.restfu.annotation.param.Query;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ package org.mariotaku.microblog.library.twitter.api;
|
|||
|
||||
import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate;
|
||||
import org.mariotaku.restfu.annotation.method.GET;
|
||||
import org.mariotaku.restfu.annotation.param.KeyValue;
|
||||
import org.mariotaku.restfu.annotation.param.Queries;
|
||||
import org.mariotaku.restfu.annotation.param.Query;
|
||||
import org.mariotaku.microblog.library.MicroBlogException;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ package org.mariotaku.microblog.library.twitter.api;
|
|||
|
||||
import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate;
|
||||
import org.mariotaku.restfu.annotation.method.GET;
|
||||
import org.mariotaku.restfu.annotation.param.KeyValue;
|
||||
import org.mariotaku.restfu.annotation.param.Path;
|
||||
import org.mariotaku.restfu.annotation.param.Queries;
|
||||
import org.mariotaku.restfu.annotation.param.Query;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ package org.mariotaku.twidere.annotation;
|
|||
|
||||
import android.support.annotation.StringDef;
|
||||
|
||||
import org.mariotaku.twidere.model.ParcelableAccount;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import android.graphics.Canvas;
|
|||
import android.graphics.Color;
|
||||
import android.graphics.ColorFilter;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.PixelFormat;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.support.annotation.NonNull;
|
||||
|
|
@ -69,7 +70,7 @@ public class AlphaPatternDrawable extends Drawable {
|
|||
|
||||
@Override
|
||||
public int getOpacity() {
|
||||
return 0;
|
||||
return PixelFormat.OPAQUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* Copyright (c) 2012 Wireless Designs, LLC
|
||||
*
|
||||
* <p>
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
|
|
@ -8,10 +8,10 @@
|
|||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* <p>
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* <p>
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
|
|
@ -32,6 +32,7 @@ import android.graphics.Color;
|
|||
import android.graphics.ColorFilter;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Path;
|
||||
import android.graphics.PixelFormat;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.Typeface;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
|
@ -79,9 +80,9 @@ public class TextDrawable extends Drawable {
|
|||
private CharSequence mText = "";
|
||||
|
||||
/* Attribute lists to pull default values from the current theme */
|
||||
private static final int[] themeAttributes = { android.R.attr.textAppearance };
|
||||
private static final int[] appearanceAttributes = { android.R.attr.textSize, android.R.attr.typeface,
|
||||
android.R.attr.textStyle, android.R.attr.textColor };
|
||||
private static final int[] themeAttributes = {android.R.attr.textAppearance};
|
||||
private static final int[] appearanceAttributes = {android.R.attr.textSize, android.R.attr.typeface,
|
||||
android.R.attr.textStyle, android.R.attr.textColor};
|
||||
|
||||
public TextDrawable(final Context context) {
|
||||
super();
|
||||
|
|
@ -184,7 +185,7 @@ public class TextDrawable extends Drawable {
|
|||
|
||||
@Override
|
||||
public int getOpacity() {
|
||||
return mTextPaint.getAlpha();
|
||||
return PixelFormat.TRANSLUCENT;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ import android.support.annotation.Nullable;
|
|||
import android.support.v4.util.LruCache;
|
||||
|
||||
import org.mariotaku.microblog.library.twitter.model.User;
|
||||
import org.mariotaku.twidere.TwidereConstants;
|
||||
import org.mariotaku.twidere.model.ParcelableStatus;
|
||||
import org.mariotaku.twidere.model.ParcelableUser;
|
||||
import org.mariotaku.twidere.model.ParcelableUserList;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import android.app.Activity
|
|||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.view.View.OnClickListener
|
||||
import android.widget.AdapterView
|
||||
import android.widget.AdapterView.OnItemClickListener
|
||||
import android.widget.ListView
|
||||
|
|
@ -41,7 +40,7 @@ import org.mariotaku.twidere.model.UserKey
|
|||
import org.mariotaku.twidere.model.util.AccountUtils
|
||||
import org.mariotaku.twidere.util.DataStoreUtils
|
||||
|
||||
class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickListener {
|
||||
class AccountSelectorActivity : BaseActivity(), OnItemClickListener {
|
||||
|
||||
private lateinit var adapter: AccountDetailsAdapter
|
||||
|
||||
|
|
@ -70,7 +69,7 @@ class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickList
|
|||
|
||||
private val isSingleSelection: Boolean
|
||||
get() {
|
||||
return intent.getBooleanExtra(EXTRA_SINGLE_SELECTION, false)
|
||||
return intent.getBooleanExtra(EXTRA_SINGLE_SELECTION, true)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -122,15 +121,11 @@ class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickList
|
|||
if (adapter.count == 1 && isSelectOnlyItemAutomatically) {
|
||||
selectSingleAccount(0)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onClick(view: View) {
|
||||
when (view.id) {
|
||||
R.id.save -> {
|
||||
confirmSelection.setOnClickListener {
|
||||
val checkedIds = accountsList.checkedItemIds
|
||||
if (checkedIds.isEmpty() && !isSelectNoneAllowed) {
|
||||
Toast.makeText(this, R.string.message_toast_no_account_selected, Toast.LENGTH_SHORT).show()
|
||||
return
|
||||
return@setOnClickListener
|
||||
}
|
||||
val data = Intent()
|
||||
data.putExtra(EXTRA_IDS, checkedIds)
|
||||
|
|
@ -138,13 +133,12 @@ class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickList
|
|||
finish()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onItemClick(parent: AdapterView<*>, view: View, position: Int, id: Long) {
|
||||
selectSingleAccount(position)
|
||||
}
|
||||
|
||||
fun selectSingleAccount(position: Int) {
|
||||
private fun selectSingleAccount(position: Int) {
|
||||
val account = adapter.getItem(position)
|
||||
val data = Intent()
|
||||
data.putExtra(EXTRA_ID, account.key.id)
|
||||
|
|
|
|||
|
|
@ -36,19 +36,19 @@
|
|||
|
||||
<LinearLayout
|
||||
android:id="@+id/selectAccountButtons"
|
||||
style="?android:buttonBarStyle"
|
||||
style="?attr/buttonBarStyle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/element_spacing_normal"
|
||||
android:layout_weight="0"
|
||||
android:gravity="center_vertical|end"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/confirmSelection"
|
||||
style="?android:borderlessButtonStyle"
|
||||
android:layout_width="match_parent"
|
||||
style="?attr/buttonBarPositiveButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:onClick="onClick"
|
||||
android:text="@android:string/ok"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue