renamed listener class, changed menu dropdown style, layout fix, library update

This commit is contained in:
nuclearfog 2021-02-10 14:30:44 +01:00
parent 764b13ab8b
commit 8305a3b25a
No known key found for this signature in database
GPG Key ID: D5490E4A81F97B14
17 changed files with 43 additions and 32 deletions

View File

@ -39,7 +39,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0' implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'

View File

@ -41,7 +41,7 @@ import org.nuclearfog.twidda.backend.engine.TwitterEngine;
import org.nuclearfog.twidda.backend.items.TrendLocation; import org.nuclearfog.twidda.backend.items.TrendLocation;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.DatabaseAdapter; import org.nuclearfog.twidda.database.DatabaseAdapter;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -64,7 +64,7 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.WRONG
* @author nuclearfog * @author nuclearfog
*/ */
public class AppSettings extends AppCompatActivity implements OnClickListener, OnDismissListener, OnSeekBarChangeListener, public class AppSettings extends AppCompatActivity implements OnClickListener, OnDismissListener, OnSeekBarChangeListener,
OnCheckedChangeListener, OnItemSelectedListener, OnDialogClick, OnColorChangedListener { OnCheckedChangeListener, OnItemSelectedListener, OnDialogConfirmListener, OnColorChangedListener {
private enum ColorMode { private enum ColorMode {
BACKGROUND, BACKGROUND,

View File

@ -29,7 +29,7 @@ import org.nuclearfog.twidda.backend.engine.EngineException;
import org.nuclearfog.twidda.backend.items.TwitterList; import org.nuclearfog.twidda.backend.items.TwitterList;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -55,7 +55,7 @@ import static org.nuclearfog.twidda.fragment.UserListFragment.RETURN_LIST_UPDATE
* @author nuclearfog * @author nuclearfog
*/ */
public class ListDetail extends AppCompatActivity implements OnTabSelectedListener, public class ListDetail extends AppCompatActivity implements OnTabSelectedListener,
OnQueryTextListener, ListManagerCallback, OnDialogClick { OnQueryTextListener, ListManagerCallback, OnDialogConfirmListener {
/** /**
* Key to get user list object * Key to get user list object

View File

@ -23,7 +23,7 @@ import org.nuclearfog.twidda.backend.holder.ListHolder;
import org.nuclearfog.twidda.backend.items.TwitterList; import org.nuclearfog.twidda.backend.items.TwitterList;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -39,7 +39,7 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.LIST_
* *
* @author nuclearfog * @author nuclearfog
*/ */
public class ListEditor extends AppCompatActivity implements OnClickListener, OnDialogClick, DialogBuilder.OnProgressStop { public class ListEditor extends AppCompatActivity implements OnClickListener, OnDialogConfirmListener, DialogBuilder.OnProgressStopListener {
/** /**
* Key for the list ID of the list if an existing list should be updated * Key for the list ID of the list if an existing list should be updated

View File

@ -20,8 +20,8 @@ import org.nuclearfog.twidda.backend.engine.EngineException;
import org.nuclearfog.twidda.backend.holder.MessageHolder; import org.nuclearfog.twidda.backend.holder.MessageHolder;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnProgressStop; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnProgressStopListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -40,7 +40,7 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.MESSA
* *
* @author nuclearfog * @author nuclearfog
*/ */
public class MessageEditor extends MediaActivity implements OnClickListener, OnDialogClick, OnProgressStop { public class MessageEditor extends MediaActivity implements OnClickListener, OnDialogConfirmListener, OnProgressStopListener {
/** /**
* key for the screen name if any * key for the screen name if any

View File

@ -31,8 +31,8 @@ import org.nuclearfog.twidda.backend.engine.EngineException;
import org.nuclearfog.twidda.backend.items.User; import org.nuclearfog.twidda.backend.items.User;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnProgressStop; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnProgressStopListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -56,7 +56,7 @@ import static org.nuclearfog.twidda.database.GlobalSettings.PROFILE_IMG_HIGH_RES
* *
* @author nuclearfog * @author nuclearfog
*/ */
public class ProfileEditor extends MediaActivity implements OnClickListener, OnProgressStop, OnDialogClick, Callback { public class ProfileEditor extends MediaActivity implements OnClickListener, OnProgressStopListener, OnDialogConfirmListener, Callback {
/** /**
* key to preload user data * key to preload user data

View File

@ -39,7 +39,7 @@ import org.nuclearfog.twidda.backend.items.Tweet;
import org.nuclearfog.twidda.backend.items.User; import org.nuclearfog.twidda.backend.items.User;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -76,7 +76,7 @@ import static org.nuclearfog.twidda.fragment.TweetFragment.RETURN_TWEET_UPDATE;
* @author nuclearfog * @author nuclearfog
*/ */
public class TweetActivity extends AppCompatActivity implements OnClickListener, public class TweetActivity extends AppCompatActivity implements OnClickListener,
OnLongClickListener, OnTagClickListener, OnDialogClick { OnLongClickListener, OnTagClickListener, OnDialogConfirmListener {
/** /**
* ID of the tweet to open. required * ID of the tweet to open. required

View File

@ -20,7 +20,7 @@ import org.nuclearfog.twidda.backend.engine.EngineException;
import org.nuclearfog.twidda.backend.holder.TweetHolder; import org.nuclearfog.twidda.backend.holder.TweetHolder;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.backend.utils.StringTools; import org.nuclearfog.twidda.backend.utils.StringTools;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -46,7 +46,7 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.TWEET
* *
* @author nuclearfog * @author nuclearfog
*/ */
public class TweetEditor extends MediaActivity implements OnClickListener, DialogBuilder.OnProgressStop, OnDialogClick { public class TweetEditor extends MediaActivity implements OnClickListener, DialogBuilder.OnProgressStopListener, OnDialogConfirmListener {
/** /**
* type of media attached to the tweet * type of media attached to the tweet

View File

@ -39,7 +39,7 @@ import org.nuclearfog.twidda.backend.items.Relation;
import org.nuclearfog.twidda.backend.items.User; import org.nuclearfog.twidda.backend.items.User;
import org.nuclearfog.twidda.backend.utils.AppStyles; import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.database.GlobalSettings; import org.nuclearfog.twidda.database.GlobalSettings;
@ -90,7 +90,7 @@ import static org.nuclearfog.twidda.fragment.UserFragment.RETURN_USER_UPDATED;
* @author nuclearfog * @author nuclearfog
*/ */
public class UserProfile extends AppCompatActivity implements OnClickListener, OnTagClickListener, public class UserProfile extends AppCompatActivity implements OnClickListener, OnTagClickListener,
OnTabSelectedListener, OnDialogClick, Callback { OnTabSelectedListener, OnDialogConfirmListener, Callback {
/** /**
* Key for the user ID * Key for the user ID

View File

@ -23,6 +23,11 @@ public class FontAdapter extends BaseAdapter {
*/ */
private static final int TEXT_PADDING = 20; private static final int TEXT_PADDING = 20;
/**
* item text padding to the next text item
*/
private static final int TEXT_PADDING_BOTTOM = 5;
/** /**
* font size of an item * font size of an item
*/ */
@ -79,7 +84,7 @@ public class FontAdapter extends BaseAdapter {
else { else {
textItem = new TextView(parent.getContext()); textItem = new TextView(parent.getContext());
textItem.setTextSize(COMPLEX_UNIT_SP, FONT_SIZE); textItem.setTextSize(COMPLEX_UNIT_SP, FONT_SIZE);
textItem.setPadding(TEXT_PADDING, 0, TEXT_PADDING, 0); textItem.setPadding(TEXT_PADDING, 0, TEXT_PADDING, TEXT_PADDING_BOTTOM);
textItem.setTextColor(settings.getFontColor()); textItem.setTextColor(settings.getFontColor());
} }
textItem.setText(name); textItem.setText(name);

View File

@ -29,6 +29,11 @@ public class LocationAdapter extends BaseAdapter {
*/ */
private static final int TEXT_PADDING = 20; private static final int TEXT_PADDING = 20;
/**
* item text padding to the next text item
*/
private static final int TEXT_PADDING_BOTTOM = 5;
/** /**
* text size of the items * text size of the items
*/ */
@ -112,7 +117,7 @@ public class LocationAdapter extends BaseAdapter {
} else { } else {
textItem = new TextView(parent.getContext()); textItem = new TextView(parent.getContext());
textItem.setTextSize(COMPLEX_UNIT_DIP, TEXT_SIZE); textItem.setTextSize(COMPLEX_UNIT_DIP, TEXT_SIZE);
textItem.setPadding(TEXT_PADDING, 0, TEXT_PADDING, 0); textItem.setPadding(TEXT_PADDING, 0, TEXT_PADDING, TEXT_PADDING_BOTTOM);
} }
textItem.setBackgroundColor(settings.getBackgroundColor() & TRANSPARENCY_MASK); textItem.setBackgroundColor(settings.getBackgroundColor() & TRANSPARENCY_MASK);
textItem.setTextColor(settings.getFontColor()); textItem.setTextColor(settings.getFontColor());

View File

@ -59,7 +59,7 @@ public final class DialogBuilder {
* @param listener listener for positive button * @param listener listener for positive button
* @return dialog instance * @return dialog instance
*/ */
public static AlertDialog create(Context context, final DialogType type, final OnDialogClick listener) { public static AlertDialog create(Context context, final DialogType type, final OnDialogConfirmListener listener) {
int posButton = R.string.dialog_button_yes; int posButton = R.string.dialog_button_yes;
int negButton = R.string.dialog_button_no; int negButton = R.string.dialog_button_no;
int title = 0; int title = 0;
@ -160,7 +160,7 @@ public final class DialogBuilder {
* @param l stop listener * @param l stop listener
* @return dialog instance to show * @return dialog instance to show
*/ */
public static Dialog createProgress(Context context, final OnProgressStop l) { public static Dialog createProgress(Context context, final OnProgressStopListener l) {
View load = View.inflate(context, R.layout.item_load, null); View load = View.inflate(context, R.layout.item_load, null);
ImageView cancel = load.findViewById(R.id.kill_button); ImageView cancel = load.findViewById(R.id.kill_button);
ProgressBar circle = load.findViewById(R.id.progress_item); ProgressBar circle = load.findViewById(R.id.progress_item);
@ -184,9 +184,9 @@ public final class DialogBuilder {
} }
/** /**
* listener for dialog * Alert dialog listener
*/ */
public interface OnDialogClick { public interface OnDialogConfirmListener {
/** /**
* called when the positive button was clicked * called when the positive button was clicked
@ -199,7 +199,7 @@ public final class DialogBuilder {
/** /**
* listener for progress * listener for progress
*/ */
public interface OnProgressStop { public interface OnProgressStopListener {
void stopProgress(); void stopProgress();
} }

View File

@ -20,7 +20,7 @@ import org.nuclearfog.twidda.backend.engine.EngineException;
import org.nuclearfog.twidda.backend.items.Message; import org.nuclearfog.twidda.backend.items.Message;
import org.nuclearfog.twidda.backend.lists.MessageList; import org.nuclearfog.twidda.backend.lists.MessageList;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
@ -38,7 +38,7 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.DEL_M
* *
* @author nuclearfog * @author nuclearfog
*/ */
public class MessageFragment extends ListFragment implements OnItemSelected, OnDialogClick { public class MessageFragment extends ListFragment implements OnItemSelected, OnDialogConfirmListener {
private MessageLoader messageTask; private MessageLoader messageTask;

View File

@ -19,7 +19,7 @@ import org.nuclearfog.twidda.backend.engine.EngineException;
import org.nuclearfog.twidda.backend.items.User; import org.nuclearfog.twidda.backend.items.User;
import org.nuclearfog.twidda.backend.lists.UserList; import org.nuclearfog.twidda.backend.lists.UserList;
import org.nuclearfog.twidda.backend.utils.DialogBuilder; import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogClick; import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
@ -34,7 +34,7 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.DEL_U
* @author nuclearfog * @author nuclearfog
*/ */
public class UserFragment extends ListFragment implements UserClickListener, public class UserFragment extends ListFragment implements UserClickListener,
OnDialogClick, ListManagerCallback { OnDialogConfirmListener, ListManagerCallback {
/** /**
* key to set the type of user list to show * key to set the type of user list to show

View File

@ -3,7 +3,7 @@
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar"> <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<item name="colorAccent">@android:color/white</item> <item name="colorAccent">@android:color/white</item>
<item name="android:colorBackground">@color/half_transparent</item> <item name="android:colorBackground">@color/background</item>
<item name="android:navigationBarColor">@android:color/black</item> <item name="android:navigationBarColor">@android:color/black</item>
<item name="android:windowAnimationStyle">@style/TransactionPending</item> <item name="android:windowAnimationStyle">@style/TransactionPending</item>
<item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentStatus">true</item>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="half_transparent">#40000000</color> <color name="half_transparent">#40000000</color>
<color name="background">#80000000</color>
<color name="bright_transparent">#afffffff</color> <color name="bright_transparent">#afffffff</color>
<color name="positive_button">#ffff4000</color> <color name="positive_button">#ffff4000</color>
<color name="negative_button">#ff0040ff</color> <color name="negative_button">#ff0040ff</color>

View File

@ -3,7 +3,7 @@
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar"> <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<item name="colorAccent">@android:color/white</item> <item name="colorAccent">@android:color/white</item>
<item name="android:colorBackground">@color/half_transparent</item> <item name="android:colorBackground">@color/background</item>
<item name="android:windowAnimationStyle">@style/TransactionPending</item> <item name="android:windowAnimationStyle">@style/TransactionPending</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>