Skip to content

Commit 77b4823

Browse files
m-i-n-a-rm-i-n-a-r
authored
Merge pull request #44 from m-i-n-a-r/develop
Develop
2 parents 4ffe281 + b75ef2b commit 77b4823

File tree

29 files changed

+238
-1056
lines changed

29 files changed

+238
-1056
lines changed

‎README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ The main purpose of the app is provide a **random choice** in different ways. Th
1414

1515
## Translations (refer to [Crowdin](https://crwd.in/randomix))
1616

17-
| LANGUAGE | STATUS | SPECIAL THANKS |
18-
|:----------------------|:--------:|:------------------------:|
19-
| **English** | complete | myself, cosmojg |
20-
| **Italian** | complete | myself |
21-
| **Spanish** | complete | myself |
22-
| **German** | complete | deep-ocean-fish, julius-d|
23-
| **Russian** | complete | BValeo |
24-
| **French** | complete | Firokat |
25-
| **Czech** | complete | Miloš Koliáš, mormegil-cz|
26-
| **Simplified Chinese**| complete | pumguy |
27-
| **Indonesian** | complete | the7thNightmare |
28-
| **Chinese (Taiwan)** | complete | Still34 |
29-
| **Asturian** | complete | Softastur |
17+
| LANGUAGE | SPECIAL THANKS |
18+
|:----------------------|-------------------------:|
19+
| **English** | myself, cosmojg |
20+
| **Italian** | myself |
21+
| **Spanish** | myself |
22+
| **German** | deep-ocean-fish, julius-d|
23+
| **Russian** | BValeo |
24+
| **French** | Firokat |
25+
| **Portuguese** | Kiskadee-dev |
26+
| **Brazilian** | Kiskadee-dev |
27+
| **Czech** | Miloš Koliáš, mormegil-cz|
28+
| **Simplified Chinese**| pumguy |
29+
| **Indonesian** | the7thNightmare |
30+
| **Chinese (Taiwan)** | Still34 |
31+
| **Asturian** | Softastur |
3032

3133
Special thanks to Nickoriginal for the overall improvement of each translation
3234

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ android {
66
applicationId "com.minar.randomix"
77
minSdkVersion 23
88
targetSdkVersion 33
9-
versionCode 38
10-
versionName "2.3"
11-
resConfigs 'en', 'ast', 'cs', 'de', 'es', 'fr', 'id', 'it', 'ru', 'zh-rCN', 'zh-rTW'
9+
versionCode 39
10+
versionName "2.4"
11+
resConfigs 'en', 'ast', 'cs', 'de', 'es', 'fr', 'id', 'it', 'ru', 'pt', 'pt-rBR', 'zh-rCN', 'zh-rTW'
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
compileOptions {

‎app/src/main/java/com/minar/randomix/utilities/CustomAuthorPreference.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.net.Uri;
99
import android.util.AttributeSet;
1010
import android.view.View;
11+
import android.widget.Button;
1112
import android.widget.ImageView;
1213
import android.widget.Toast;
1314

@@ -38,12 +39,15 @@ public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
3839
ImageView l3 = v.findViewById(R.id.minarps);
3940
ImageView l4 = v.findViewById(R.id.minargit);
4041
ImageView l5 = v.findViewById(R.id.minarsite);
42+
Button translate = v.findViewById(R.id.translateButton);
43+
4144
logo.setOnClickListener(this);
4245
l1.setOnClickListener(this);
4346
l2.setOnClickListener(this);
4447
l3.setOnClickListener(this);
4548
l4.setOnClickListener(this);
4649
l5.setOnClickListener(this);
50+
translate.setOnClickListener(this);
4751
Drawable logoDrawable = logo.getDrawable();
4852

4953
// Delay the execution of the logo animation a bit
@@ -67,6 +71,15 @@ public void onClick(View v) {
6771
return;
6872
}
6973

74+
// Translate the app
75+
if (pressedId == R.id.translateButton) {
76+
if (act instanceof MainActivity) ((MainActivity) act).vibrate();
77+
uri = Uri.parse(getContext().getString(R.string.dev_crowdin));
78+
Intent intent1 = new Intent(Intent.ACTION_VIEW, uri);
79+
getContext().startActivity(intent1);
80+
return;
81+
}
82+
7083
// Instagram
7184
if (pressedId == R.id.minarig) {
7285
if (act instanceof MainActivity) ((MainActivity) act).vibrate();

‎app/src/main/res/drawable/animated_randomix_logo.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
android:name="logo"
1313
android:pivotX="12"
1414
android:pivotY="12"
15-
android:scaleX=".8"
16-
android:scaleY=".8">
15+
android:scaleX=".6"
16+
android:scaleY=".6">
1717
<path
1818
android:name="spiral"
1919
android:pathData="M 11.118 22.468 C 9.105 22.205 7.437 21.604 5.889 20.53 C 5.135 19.943 4.473 19.303 3.847 18.592 C 3.304 17.975 2.65 16.89 2.317 16.055 C 1.932 15.149 1.73 14.11 1.598 13.311 C 1.524 12.865 1.516 11.26 1.585 10.766 C 1.717 9.802 1.926 8.913 2.266 8.041 C 2.659 7.082 3.145 6.265 3.796 5.444 C 4.621 4.493 5.609 3.636 6.421 3.089 C 7.819 2.192 9.416 1.718 10.874 1.539 C 11.245 1.494 12.885 1.501 13.27 1.549 C 14.733 1.732 15.985 2.128 17.046 2.743 C 18.524 3.56 19.917 5.008 20.821 6.219 C 21.484 7.116 22.148 8.766 22.345 10.009 C 22.566 11.684 22.462 13.528 22.141 14.903 C 21.872 15.84 21.402 16.851 20.927 17.593 C 20.136 18.821 18.973 19.941 17.908 20.706 C 16.392 21.681 15.107 22.164 13.386 22.417 C 12.887 22.489 11.716 22.515 11.118 22.468 Z M 12.559 21.069 C 14.603 20.816 15.888 19.536 16.096 17.545 C 16.113 17.381 16.113 17.381 15.516 17.381 C 14.839 17.381 14.893 17.365 14.892 17.563 C 14.889 18.357 13.933 19.988 13.86 19.324 C 13.713 17.999 12.278 17.358 11.23 18.15 C 10.789 18.482 10.517 19.147 10.604 19.676 C 10.628 19.824 10.636 19.824 10.411 19.687 C 9.52 19.146 9.007 18.046 9.069 16.808 C 9.122 15.737 9.55 14.987 10.556 14.201 C 10.807 14.004 11.251 13.649 11.377 13.542 C 11.457 13.476 11.457 13.476 11.457 14.389 C 11.457 15.303 11.457 15.303 12.029 15.303 C 12.602 15.303 12.602 15.303 12.602 14.323 C 12.602 13.783 12.611 13.329 12.62 13.314 C 12.642 13.28 12.827 13.486 13.265 14.031 C 14.592 15.683 15.292 16.076 16.906 16.077 C 19.507 16.078 21.034 14.645 21.119 12.121 C 21.197 9.793 19.558 7.919 17.431 7.903 C 17.422 7.903 17.415 8.174 17.415 8.505 C 17.415 9.177 17.4 9.133 17.627 9.133 C 18.199 9.133 18.965 9.488 19.419 9.963 C 19.588 10.14 19.588 10.14 19.36 10.165 C 18.033 10.311 17.391 11.746 18.184 12.795 C 18.516 13.236 19.181 13.508 19.71 13.421 C 19.777 13.41 19.832 13.405 19.832 13.41 C 19.832 13.897 18.606 14.748 17.691 14.897 C 16.141 15.149 15.197 14.719 14.056 13.24 C 13.91 13.051 13.729 12.825 13.654 12.738 C 13.517 12.579 13.517 12.579 14.427 12.573 C 15.337 12.568 15.337 12.568 15.337 11.995 C 15.337 11.423 15.337 11.423 14.356 11.423 C 13.817 11.423 13.364 11.415 13.349 11.405 C 13.317 11.385 13.548 11.178 14.081 10.749 C 15.764 9.396 16.154 8.666 16.116 6.94 C 16.062 4.466 14.616 2.992 12.162 2.906 C 9.857 2.826 8.195 4.227 7.962 6.446 C 7.945 6.61 7.945 6.61 8.543 6.61 C 9.22 6.61 9.166 6.626 9.167 6.428 C 9.169 5.634 10.126 4.003 10.199 4.667 C 10.346 5.992 11.781 6.633 12.829 5.841 C 13.269 5.509 13.542 4.844 13.455 4.315 C 13.431 4.17 13.425 4.172 13.603 4.276 C 14.521 4.812 15.053 5.928 14.99 7.183 C 14.937 8.254 14.509 9.004 13.503 9.79 C 13.252 9.987 12.808 10.342 12.681 10.449 C 12.602 10.515 12.602 10.515 12.602 9.602 C 12.602 8.688 12.602 8.688 12.029 8.688 C 11.457 8.688 11.457 8.688 11.457 9.668 C 11.456 10.208 11.449 10.661 11.439 10.676 C 11.419 10.708 11.212 10.477 10.783 9.944 C 9.43 8.261 8.7 7.871 6.974 7.909 C 4.493 7.963 3.016 9.418 2.941 11.879 C 2.871 14.16 4.223 15.788 6.405 16.052 C 6.644 16.081 6.644 16.081 6.644 15.482 C 6.644 14.805 6.659 14.859 6.462 14.858 C 5.667 14.856 4.037 13.899 4.702 13.826 C 6.803 13.593 6.653 10.564 4.54 10.564 C 4.228 10.564 4.228 10.564 4.294 10.448 C 4.811 9.523 5.952 8.972 7.217 9.035 C 8.288 9.088 9.038 9.516 9.824 10.522 C 10.02 10.773 10.376 11.217 10.482 11.344 C 10.549 11.423 10.549 11.423 9.635 11.423 C 8.722 11.423 8.722 11.423 8.722 11.996 C 8.722 12.568 8.722 12.568 9.702 12.568 C 10.242 12.569 10.695 12.576 10.71 12.586 C 10.742 12.606 10.511 12.813 9.977 13.242 C 8.294 14.595 7.904 15.326 7.943 17.051 C 7.991 19.16 9.048 20.55 10.927 20.974 C 11.389 21.078 12.136 21.122 12.559 21.069 Z"

‎app/src/main/res/drawable/ic_translate_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="?attr/colorPrimary"
8+
android:pathData="M13.35,22q-0.6,0 -0.862,-0.387 -0.263,-0.388 -0.063,-0.963l3.65,-9.675q0.15,-0.4 0.563,-0.688Q17.05,10 17.5,10q0.425,0 0.85,0.287 0.425,0.288 0.575,0.688l3.65,9.675q0.2,0.575 -0.062,0.963 -0.263,0.387 -0.888,0.387 -0.275,0 -0.5,-0.175 -0.225,-0.175 -0.325,-0.425l-0.85,-2.45L15.1,18.95l-0.875,2.45q-0.1,0.25 -0.35,0.425 -0.25,0.175 -0.525,0.175ZM15.7,17.2h3.6l-1.75,-4.95h-0.1ZM7.15,8.55q0.4,0.725 0.85,1.337 0.45,0.613 1.05,1.263 1.1,-1.2 1.825,-2.462Q11.6,7.425 12.1,6L2,6q-0.425,0 -0.712,-0.287Q1,5.425 1,5t0.288,-0.713Q1.575,4 2,4h6L8,3q0,-0.425 0.288,-0.713Q8.575,2 9,2t0.713,0.287Q10,2.575 10,3v1h6q0.425,0 0.712,0.287Q17,4.575 17,5t-0.288,0.713Q16.425,6 16,6h-1.9q-0.525,1.775 -1.425,3.45 -0.9,1.675 -2.225,3.15l2.4,2.45 -0.75,2.05L9,14l-4.3,4.3q-0.275,0.275 -0.7,0.275 -0.425,0 -0.7,-0.275 -0.275,-0.275 -0.275,-0.7 0,-0.425 0.275,-0.7l4.35,-4.35q-0.675,-0.775 -1.25,-1.563 -0.575,-0.787 -1.025,-1.662Q5.1,8.8 5.35,8.4t0.875,-0.4q0.25,0 0.525,0.162 0.275,0.163 0.4,0.388Z" />
9+
</vector>

‎app/src/main/res/layout/activity_main.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
android:id="@+id/navigation"
2121
android:layout_width="match_parent"
2222
android:layout_height="@dimen/bottom_navbar_height"
23-
app:itemIconTint="@drawable/bottom_navbar_item"
2423
app:labelVisibilityMode="labeled"
2524
app:layout_constraintBottom_toBottomOf="parent"
2625
app:layout_constraintLeft_toLeftOf="parent"

‎app/src/main/res/layout/fragment_settings.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
app:layout_constraintStart_toStartOf="parent"
2121
app:layout_constraintTop_toTopOf="parent" />
2222

23-
2423
<ImageView
2524
android:id="@+id/imageMinar"
2625
android:layout_width="match_parent"
@@ -57,7 +56,7 @@
5756
android:focusable="true"
5857
android:paddingVertical="@dimen/activity_vertical_margin"
5958
android:src="@drawable/ic_instagram_black_24dp"
60-
app:layout_constraintBottom_toBottomOf="parent"
59+
app:layout_constraintBottom_toTopOf="@id/translateButton"
6160
app:layout_constraintEnd_toStartOf="@id/minartt"
6261
app:layout_constraintHorizontal_chainStyle="spread"
6362
app:layout_constraintStart_toStartOf="parent"
@@ -132,4 +131,22 @@
132131
app:layout_constraintTop_toTopOf="@id/minarig"
133132
app:tint="?attr/colorPrimary" />
134133

134+
<Button
135+
android:id="@+id/translateButton"
136+
style="@style/Widget.Material3.Button.ElevatedButton.Icon"
137+
android:layout_width="wrap_content"
138+
android:layout_height="wrap_content"
139+
android:layout_marginVertical="@dimen/linear_vertical_padding"
140+
android:contentDescription="@string/translate_app"
141+
android:paddingVertical="@dimen/linear_vertical_padding"
142+
android:text="@string/translate_app"
143+
android:textColor="?attr/colorPrimary"
144+
android:tint="?attr/colorPrimary"
145+
app:icon="@drawable/ic_translate_24dp"
146+
app:layout_constraintBottom_toBottomOf="parent"
147+
app:layout_constraintEnd_toEndOf="parent"
148+
app:layout_constraintStart_toStartOf="parent"
149+
app:layout_constraintTop_toBottomOf="@id/minarsite"
150+
app:rippleColor="?attr/colorPrimary" />
151+
135152
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)