Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

version upgrade, icon fix

This commit is contained in:
nuclearfog 2021-12-15 20:26:33 +01:00
parent 420495af2c
commit 64a14f865c
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
26 changed files with 67 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -12,8 +12,8 @@ android {
applicationId 'org.nuclearfog.twidda'
minSdkVersion 16
targetSdkVersion 31
versionCode 49
versionName '1.10.4'
versionCode 50
versionName '1.10.5'
// limiting language support for smaller APK size
resConfigs 'en', 'de-rDE', 'zh-rCN'
vectorDrawables.useSupportLibrary true

4
app/src/main/java/org/nuclearfog/twidda/activities/TweetActivity.java
View File

@ -180,9 +180,9 @@ public class TweetActivity extends AppCompatActivity implements OnClickListener,
settings = GlobalSettings.getInstance(this);
ansButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.answer, 0, 0, 0);
rtwButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.retweet, 0, 0, 0);
tweetLocGPS.setCompoundDrawablesWithIntrinsicBounds(R.drawable.userlocation, 0, 0, 0);
tweetLocGPS.setCompoundDrawablesWithIntrinsicBounds(R.drawable.location, 0, 0, 0);
sensitive_media.setCompoundDrawablesWithIntrinsicBounds(R.drawable.sensitive, 0, 0, 0);
replyName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.followback, 0, 0, 0);
replyName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.back, 0, 0, 0);
retweeter.setCompoundDrawablesWithIntrinsicBounds(R.drawable.retweet, 0, 0, 0);
tweetText.setMovementMethod(LinkAndScrollMovement.getInstance());
tweetText.setLinkTextColor(settings.getHighlightColor());

6
app/src/main/java/org/nuclearfog/twidda/activities/UserProfile.java
View File

@ -191,10 +191,10 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, O
}
following.setCompoundDrawablesWithIntrinsicBounds(R.drawable.following, 0, 0, 0);
follower.setCompoundDrawablesWithIntrinsicBounds(R.drawable.follower, 0, 0, 0);
user_createdAt.setCompoundDrawablesWithIntrinsicBounds(R.drawable.calendar, 0, 0, 0);
user_location.setCompoundDrawablesWithIntrinsicBounds(R.drawable.userlocation, 0, 0, 0);
user_createdAt.setCompoundDrawablesWithIntrinsicBounds(R.drawable.date, 0, 0, 0);
user_location.setCompoundDrawablesWithIntrinsicBounds(R.drawable.location, 0, 0, 0);
user_website.setCompoundDrawablesWithIntrinsicBounds(R.drawable.link, 0, 0, 0);
follow_back.setCompoundDrawablesWithIntrinsicBounds(R.drawable.followback, 0, 0, 0);
follow_back.setCompoundDrawablesWithIntrinsicBounds(R.drawable.back, 0, 0, 0);
toolbar.setBackgroundColor(settings.getBackgroundColor() & TOOLBAR_TRANSPARENCY);
username.setBackgroundColor(settings.getBackgroundColor() & TEXT_TRANSPARENCY);
follow_back.setBackgroundColor(settings.getBackgroundColor() & TEXT_TRANSPARENCY);

4
app/src/main/java/org/nuclearfog/twidda/adapter/holder/ListHolder.java
View File

@ -53,9 +53,9 @@ public class ListHolder extends ViewHolder {
icons[1].setImageResource(R.drawable.lock);
icons[2].setImageResource(R.drawable.user);
icons[3].setImageResource(R.drawable.subscriber);
icons[4].setImageResource(R.drawable.calendar);
icons[4].setImageResource(R.drawable.date);
icons[5].setImageResource(R.drawable.lock);
icons[6].setImageResource(R.drawable.followback);
icons[6].setImageResource(R.drawable.back);
// theme views
for (TextView tv : textViews) {
tv.setTextColor(settings.getFontColor());

3
app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
View File

@ -678,7 +678,8 @@ public class GlobalSettings {
/**
* check if 'like' is used instead of 'favorite'
* @return
*
* @return true if 'like' should be used
*/
public boolean likeEnabled() {
return enableLike;

6
app/src/main/res/drawable/answer.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M5.8,12.2V6H2C0.9,6 0,6.9 0,8v6c0,1.1 0.9,2 2,2h1v3l3,-3h5c1.1,0 2,-0.9 2,-2v-1.82c-0.064,0.014 -0.132,0.021 -0.2,0.021h-7V12.2zM18,1H9C7.9,1 7,1.9 7,3v8h7l3,3v-3h1c1.1,0 2,-0.899 2,-2V3C20,1.9 19.1,1 18,1z" />
</vector>
</vector>

6
app/src/main/res/drawable/followback.xml → app/src/main/res/drawable/back.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M19,16.685c0,0 -2.225,-9.732 -11,-9.732V2.969L1,9.542l7,6.69v-4.357C12.763,11.874 16.516,12.296 19,16.685z" />
</vector>
</vector>

18
app/src/main/res/drawable/block.xml
View File

@ -1,13 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="30dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M8.4646,14.1213C8.074,14.5118 8.074,15.145 8.4646,15.5355C8.8551,15.926 9.4882,15.926 9.8788,15.5355L15.5356,9.8786C15.9262,9.4881 15.9262,8.8549 15.5356,8.4644C15.1451,8.0739 14.5119,8.0739 14.1214,8.4644L8.4646,14.1213Z"
android:fillColor="#ffffff" />
<path
android:pathData="M6.3432,17.6569C9.4673,20.781 14.5327,20.781 17.6569,17.6569C20.781,14.5327 20.781,9.4673 17.6569,6.3432C14.5327,3.219 9.4673,3.219 6.3432,6.3432C3.219,9.4673 3.219,14.5327 6.3432,17.6569ZM16.2426,16.2426C13.8995,18.5858 10.1005,18.5858 7.7574,16.2426C5.4142,13.8995 5.4142,10.1005 7.7574,7.7574C10.1005,5.4142 13.8995,5.4142 16.2426,7.7574C18.5858,10.1005 18.5858,13.8995 16.2426,16.2426Z"
android:fillColor="#ffffff"
android:fillType="evenOdd" />
android:width="24dp"
android:height="24dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M10,0.4c-5.303,0 -9.601,4.298 -9.601,9.6c0,5.303 4.298,9.601 9.601,9.601c5.301,0 9.6,-4.298 9.6,-9.601C19.6,4.698 15.301,0.4 10,0.4zM2.399,10c0,-4.197 3.402,-7.6 7.6,-7.6c1.829,0 3.506,0.647 4.817,1.723L4.122,14.817C3.046,13.505 2.399,11.829 2.399,10zM9.999,17.599c-1.828,0 -3.505,-0.646 -4.815,-1.722L15.878,5.184C16.953,6.496 17.6,8.171 17.6,10C17.6,14.197 14.196,17.599 9.999,17.599z"
android:fillColor="#FFFFFF"/>
</vector>

6
app/src/main/res/drawable/calendar.xml → app/src/main/res/drawable/date.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="12dp"
android:width="14sp"
android:height="14sp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="#FFFFFF"
android:pathData="M17,3h-1v2h-3V3H7v2H4V3H3C1.899,3 1,3.9 1,5v12c0,1.1 0.899,2 2,2h14c1.1,0 2,-0.9 2,-2V5C19,3.9 18.1,3 17,3zM17,17H3V9h14V17zM6.5,1h-2v3.5h2V1zM15.5,1h-2v3.5h2V1z" />
</vector>
</vector>

6
app/src/main/res/drawable/favorite.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="120"
android:viewportHeight="120">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M2.287,47.815l23.096,19.578L18.2,96.831c-1.411,5.491 4.648,9.998 9.575,6.901L53.55,87.813l25.774,15.916c4.79,2.955 10.844,-1.408 9.576,-6.902l-7.184,-29.435l23.099,-19.579c4.363,-3.661 2.111,-10.844 -3.662,-11.267l-30.282,-2.255L59.464,6.266c-2.112,-5.211 -9.577,-5.211 -11.832,0L36.225,34.292L5.944,36.547C0.174,37.113 -2.081,44.154 2.287,47.815z" />
</vector>
</vector>

6
app/src/main/res/drawable/follower.xml
View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="328.0"
android:viewportHeight="328.0">
<path
@ -12,4 +12,4 @@
<path
android:fillColor="#FFFFFFFF"
android:pathData="M223,116.8c-34.5,0 -65.1,16.7 -84.3,42.5c-7.8,-1.6 -15.7,-2.5 -23.7,-2.5c-63.4,0 -115,51.6 -115,115c0,8.3 6.7,15 15,15h125.6c19.2,24.3 49,40 82.4,40c57.9,0 105,-47.1 105,-105S280.9,116.8 223,116.8zM31.3,256.8c7.1,-39.7 41.9,-70 83.7,-70c3,0 5.9,0.2 8.8,0.5c-3.8,10.8 -5.8,22.4 -5.8,34.5c0,12.3 2.1,24 6,35H31.3zM223,296.8c-41.4,0 -75,-33.6 -75,-75s33.6,-75 75,-75s75,33.6 75,75S264.4,296.8 223,296.8z" />
</vector>
</vector>

6
app/src/main/res/drawable/following.xml
View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="328.0"
android:viewportHeight="328.0">
<path
@ -12,4 +12,4 @@
<path
android:fillColor="#FFFFFFFF"
android:pathData="M223,116.8c-34.5,0 -65.1,16.7 -84.3,42.5c-7.8,-1.6 -15.7,-2.5 -23.7,-2.5c-63.4,0 -115,51.6 -115,115c0,8.3 6.7,15 15,15h125.6c19.2,24.3 49,40 82.4,40c57.9,0 105,-47.1 105,-105S280.9,116.8 223,116.8zM31.3,256.8c7.1,-39.7 41.9,-70 83.7,-70c3,0 5.9,0.2 8.8,0.5c-3.8,10.8 -5.8,22.4 -5.8,34.5c0,12.3 2.1,24 6,35H31.3zM223,296.8c-41.4,0 -75,-33.6 -75,-75s33.6,-75 75,-75s75,33.6 75,75S264.4,296.8 223,296.8z" />
</vector>
</vector>

6
app/src/main/res/drawable/gif.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="22dp"
android:height="22dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M17.125,6.17l-2.046,-5.635c-0.151,-0.416 -0.595,-0.637 -0.989,-0.492L0.492,5.006C0.098,5.15 -0.101,5.603 0.051,6.019l2.156,5.941V8.777c0,-1.438 1.148,-2.607 2.56,-2.607H8.36l4.285,-3.008l2.479,3.008H17.125zM19.238,8H4.767c-0.42,0 -0.762,0.334 -0.762,0.777v9.42C4.006,18.641 4.348,19 4.767,19h14.471C19.658,19 20,18.641 20,18.197v-9.42C20,8.334 19.658,8 19.238,8zM18,17H6v-2l1.984,-4.018l2.768,3.436l2.598,-2.662l3.338,-1.205L18,14V17z"
android:fillColor="#FFFFFF" />
</vector>
</vector>

6
app/src/main/res/drawable/image.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="22dp"
android:height="22dp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M19,2H1C0.447,2 0,2.447 0,3v14c0,0.552 0.447,1 1,1h18c0.553,0 1,-0.448 1,-1V3C20,2.448 19.553,2 19,2zM18,16H2V4h16V16zM14.315,10.877l-3.231,1.605l-3.77,-6.101L4,14h12L14.315,10.877zM13.25,9c0.69,0 1.25,-0.56 1.25,-1.25S13.94,6.5 13.25,6.5S12,7.06 12,7.75S12.56,9 13.25,9z" />
</vector>
</vector>

6
app/src/main/res/drawable/like.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M17.19,4.155c-1.672,-1.534 -4.383,-1.534 -6.055,0L10,5.197L8.864,4.155c-1.672,-1.534 -4.382,-1.534 -6.054,0c-1.881,1.727 -1.881,4.52 0,6.246L10,17l7.19,-6.599C19.07,8.675 19.07,5.881 17.19,4.155z"
android:fillColor="#FFFFFF"/>
</vector>
</vector>

4
app/src/main/res/drawable/link.xml
View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="12dp"
android:width="14sp"
android:height="14sp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path

10
app/src/main/res/drawable/location.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
android:width="14sp"
android:height="14sp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path
android:pathData="M10,2.009c-2.762,0 -5,2.229 -5,4.99c0,4.774 5,11 5,11s5,-6.227 5,-11C15,4.239 12.762,2.009 10,2.009zM10,9.76c-1.492,0 -2.7,-1.209 -2.7,-2.7s1.208,-2.7 2.7,-2.7c1.49,0 2.699,1.209 2.699,2.7S11.49,9.76 10,9.76z"
android:fillColor="#FFFFFF" />
</vector>
</vector>

4
app/src/main/res/drawable/lock.xml
View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path

2
app/src/main/res/drawable/mute.xml
View File

@ -12,4 +12,4 @@
<path
android:fillColor="#FFFFFF"
android:pathData="M55.463,83.202l193.146,193.145l18.88,18.874c3.459,3.469 8.005,5.204 12.547,5.204c4.541,0 9.087,-1.735 12.552,-5.204c6.934,-6.929 6.934,-18.17 0,-25.104l-42.197,-42.197L103.037,80.566L38.771,16.314c-3.461,-3.469 -8.005,-5.204 -12.549,-5.204c-4.544,0 -9.085,1.735 -12.552,5.204c-6.937,6.928 -6.937,18.17 0,25.101L55.463,83.202z" />
</vector>
</vector>

6
app/src/main/res/drawable/retweet.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M5,13V8h2L3.5,4L0,8h2v6c0,1.104 0.895,2 2,2h9.482l-2.638,-3H5zM9.156,7L6.518,4H16c1.104,0 2,0.897 2,2v6h2l-3.5,4L13,12h2V7H9.156z" />
</vector>
</vector>

4
app/src/main/res/drawable/search.xml
View File

@ -1,8 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:viewportWidth="21.0"
android:viewportHeight="21.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />

9
app/src/main/res/drawable/userlocation.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="12dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M10,2.009c-2.762,0 -5,2.229 -5,4.99c0,4.774 5,11 5,11s5,-6.227 5,-11C15,4.239 12.762,2.009 10,2.009zM10,9.76c-1.492,0 -2.7,-1.209 -2.7,-2.7s1.208,-2.7 2.7,-2.7c1.49,0 2.699,1.209 2.699,2.7S11.49,9.76 10,9.76z"
android:fillColor="#FFFFFF" />
</vector>

4
app/src/main/res/drawable/verify.xml
View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:width="16sp"
android:height="16sp"
android:viewportWidth="560"
android:viewportHeight="560">
<path

6
app/src/main/res/drawable/video.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:width="22dp"
android:height="22dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M20,5V3.799C20,3.357 19.643,3 19.201,3h-18.4C0.358,3 0,3.357 0,3.799V5h2v2H0v2h2v2H0v2h2v2H0v1.199C0,16.641 0.358,17 0.801,17h18.4C19.643,17 20,16.641 20,16.199V15h-2v-2h2v-2h-2V9h2V7h-2V5H20zM8,13V7l5,3L8,13z"
android:fillColor="#FFFFFF" />
</vector>
</vector>

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

@ -204,7 +204,7 @@
<dimen name="userlist_title_textsize">20sp</dimen>
<!--dimens of tabitem.xml-->
<dimen name="tabitem_icon_size">22dp</dimen>
<dimen name="tabitem_icon_size">22sp</dimen>
<dimen name="tabitem_textsize">11sp</dimen>
<!--dimens of controlpanel-->

3
gradle.properties
View File

@ -14,5 +14,4 @@
org.gradle.configureondemand=false;
org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
android.enableJetifier=true
android.useAndroidX=true
android.enableR8.fullMode=true
android.useAndroidX=true