Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout fix, fixed app info dialog behaviour, fixed comments

Browse Source
This commit is contained in:
nuclearfog 2021-02-14 20:23:38 +01:00
parent 69969cc3a2
commit 834dec0a5f
No known key found for this signature in database
GPG Key ID: D5490E4A81F97B14
6 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
View File

@ -31,7 +31,6 @@ import com.flask.colorpicker.ColorPickerView;
import com.flask.colorpicker.OnColorChangedListener;
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
import org.nuclearfog.twidda.BuildConfig;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.adapter.FontAdapter;
import org.nuclearfog.twidda.adapter.LocationAdapter;
@ -80,7 +79,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
private LocationLoader locationAsync;
private LocationAdapter locationAdapter;
private Dialog connectDialog, databaseDialog, logoutDialog, color_dialog_selector;
private Dialog connectDialog, databaseDialog, logoutDialog, color_dialog_selector, appInfo;
private View root, layout_key, layout_proxy, layout_auth_en, layout_auth;
private EditText proxyAddr, proxyPort, proxyUser, proxyPass, api_key1, api_key2;
private CompoundButton enableProxy, enableAuth, hqImage, enableAPI;
@ -177,6 +176,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
connectDialog = DialogBuilder.create(this, WRONG_PROXY, this);
databaseDialog = DialogBuilder.create(this, DEL_DATABASE, this);
logoutDialog = DialogBuilder.create(this, LOGOUT_APP, this);
appInfo = DialogBuilder.createInfoDialog(this);
for (Button btn : colorButtons)
btn.setOnClickListener(this);
@ -236,13 +236,9 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
if (item.getItemId() == R.id.settings_info) {
Dialog dialog = new Dialog(this, R.style.AppInfoDialog);
dialog.setContentView(R.layout.dialog_app_info);
String versionName = " V" + BuildConfig.VERSION_NAME;
TextView appInfo = dialog.findViewById(R.id.settings_app_info);
appInfo.setLinkTextColor(settings.getHighlightColor());
appInfo.append(versionName);
dialog.show();
if (!appInfo.isShowing()) {
appInfo.show();
}
}
return super.onOptionsItemSelected(item);
}

2
app/src/main/java/org/nuclearfog/twidda/backend/lists/UserList.java
View File

@ -8,7 +8,7 @@ import org.nuclearfog.twidda.backend.items.User;
import java.util.LinkedList;
/**
* custom twitter user list with cursors included
* custom twitter user list containing cursor information
*
* @author nuclearfog
*/

2
app/src/main/java/org/nuclearfog/twidda/backend/lists/UserLists.java
View File

@ -8,7 +8,7 @@ import org.nuclearfog.twidda.backend.items.TwitterList;
import java.util.LinkedList;
/**
* Container class for user lists containing extra cursors for paging
* Container class for user lists containing cursor information
*
* @author nuclearfog
*/

19
app/src/main/java/org/nuclearfog/twidda/backend/utils/DialogBuilder.java
View File

@ -7,9 +7,12 @@ import android.content.DialogInterface.OnClickListener;
import android.view.View;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import org.nuclearfog.twidda.BuildConfig;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.database.GlobalSettings;
@ -183,6 +186,22 @@ public final class DialogBuilder {
return loadingCircle;
}
/**
* create dialog window with app information and links
*
* @param context context to create dialog
* @return dialog instance
*/
@NonNull
public static Dialog createInfoDialog(Context context) {
Dialog dialog = new Dialog(context, R.style.AppInfoDialog);
dialog.setContentView(R.layout.dialog_app_info);
String versionName = " V" + BuildConfig.VERSION_NAME;
TextView appInfo = dialog.findViewById(R.id.settings_app_info);
appInfo.append(versionName);
return dialog;
}
/**
* Alert dialog listener
*/

34
app/src/main/res/layout/page_tweet.xml
View File

@ -101,12 +101,10 @@
style="@style/FeedbackButton"
android:layout_width="wrap_content"
android:layout_height="@dimen/tweet_button_height"
android:layout_marginStart="@dimen/tweet_button_margin"
android:layout_marginLeft="@dimen/tweet_button_margin"
android:layout_marginTop="@dimen/tweet_button_margin"
android:layout_margin="@dimen/tweet_textview_margin"
android:drawablePadding="@dimen/tweet_padding_drawable"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_padding"
android:paddingRight="@dimen/tweet_button_padding"
android:textSize="@dimen/tweet_textsize_small"
android:visibility="invisible"
app:layout_constraintHorizontal_bias="0.0"
@ -120,12 +118,10 @@
style="@style/FeedbackButton"
android:layout_width="wrap_content"
android:layout_height="@dimen/tweet_button_height"
android:layout_marginStart="@dimen/tweet_textview_margin"
android:layout_marginLeft="@dimen/tweet_textview_margin"
android:layout_marginTop="@dimen/tweet_button_margin"
android:layout_margin="@dimen/tweet_textview_margin"
android:drawablePadding="@dimen/tweet_padding_drawable"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_padding"
android:paddingRight="@dimen/tweet_button_padding"
android:textSize="@dimen/tweet_textsize_small"
android:visibility="invisible"
app:layout_constraintHorizontal_chainStyle="packed"
@ -180,8 +176,6 @@
android:layout_marginEnd="@dimen/tweet_textview_margin"
android:layout_marginRight="@dimen/tweet_textview_margin"
android:drawablePadding="@dimen/tweet_padding_drawable"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:singleLine="true"
android:text="@string/tweet_sensitive_media"
android:textSize="@dimen/tweet_textsize_small"
@ -214,8 +208,8 @@
android:layout_height="@dimen/tweet_button_height"
android:layout_marginStart="@dimen/tweet_button_margin"
android:layout_marginLeft="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_padding"
android:paddingRight="@dimen/tweet_button_padding"
android:singleLine="true"
android:textSize="@dimen/tweet_textsize_locale"
android:visibility="invisible"
@ -271,8 +265,8 @@
android:layout_height="@dimen/tweet_button_height"
android:layout_margin="@dimen/tweet_button_margin"
android:drawablePadding="@dimen/tweet_padding_drawable"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_padding"
android:paddingRight="@dimen/tweet_button_padding"
android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/tweet_retweet"
app:layout_constraintHorizontal_weight="1"
@ -287,8 +281,8 @@
android:layout_height="@dimen/tweet_button_height"
android:layout_margin="@dimen/tweet_button_margin"
android:drawablePadding="@dimen/tweet_padding_drawable"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_padding"
android:paddingRight="@dimen/tweet_button_padding"
android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/tweet_favorite"
app:layout_constraintHorizontal_weight="1"
@ -303,8 +297,8 @@
android:layout_height="@dimen/tweet_button_height"
android:layout_margin="@dimen/tweet_button_margin"
android:drawablePadding="@dimen/tweet_padding_drawable"
android:paddingLeft="@dimen/tweet_button_margin"
android:paddingRight="@dimen/tweet_button_margin"
android:paddingLeft="@dimen/tweet_button_padding"
android:paddingRight="@dimen/tweet_button_padding"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"

1
app/src/main/res/values/dimens.xml
View File

@ -27,6 +27,7 @@
<dimen name="tweet_profileimage_margin">5dp</dimen>
<dimen name="tweet_textview_margin">5dp</dimen>
<dimen name="tweet_button_margin">5dp</dimen>
<dimen name="tweet_button_padding">5dp</dimen>
<dimen name="tweet_button_height">20sp</dimen>
<dimen name="tweet_padding_drawable">5dp</dimen>
<dimen name="tweet_button_media_width">64dp</dimen>