Skip to content

Commit c47d9dd

Browse files
final tweaks
Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent fd8f746 commit c47d9dd

4 files changed

Lines changed: 15 additions & 9 deletions

File tree

app/proguard-rules.pro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,14 @@
188188
}
189189

190190
# Keep all of Cronet API and google's internal classes
191-
-keep class org.chromium.** { *; }
192-
-keep class org.chromium.net.** { *; }
193191
-keep class com.google.common.util.concurrent.** { *; }
194192
-keepclassmembers class kotlin.SafePublicationLazyImpl {
195193
java.lang.Object _value;
196194
}
197195

196+
# fix bug with androidx work and future
197+
-keep class androidx.work.impl.utils.futures.* { *; }
198+
198199
# Silence some warnings
199200
-dontwarn android.os.SystemProperties
200201
-dontwarn android.view.ThreadedRenderer

app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public Type getType() {
128128
return Type.FOOTER;
129129
} else if (this.separator != null) {
130130
Timber.i("Module %s is separator", this.moduleId);
131-
Thread.dumpStack();
132131
return Type.SEPARATOR;
133132
} else if (this.notificationType != null) {
134133
Timber.i("Module %s is notification", this.moduleId);
@@ -249,7 +248,6 @@ public int compare(ModuleHolder o1, ModuleHolder o2) {
249248
@Override
250249
@SuppressWarnings("ConstantConditions")
251250
public int compare(ModuleHolder o1, ModuleHolder o2) {
252-
Thread.dumpStack();
253251
return o1.notificationType.compareTo(o2.notificationType);
254252
}
255253
}, UPDATABLE(R.string.updatable, true, true) {

app/src/main/res/layout/activity_setup.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,23 @@
288288
<com.google.android.material.materialswitch.MaterialSwitch
289289
android:layout_width="match_parent"
290290
android:layout_height="wrap_content"
291-
android:autoLink="web"
292291
android:checked="false"
293292
android:id="@+id/setup_agree_eula"
294293
android:layout_marginHorizontal="2dp"
295294
android:layout_marginVertical="4dp"
296-
android:textColorLink="@color/blue"
297-
android:text="@string/eula_agree_v2"
295+
android:text="@string/eula_sum"
298296
android:textAppearance="@android:style/TextAppearance.Material.Small"
299297
android:drawableStart="@drawable/baseline_library_add_check_24"
300298
android:drawablePadding="8dp" />
301299

300+
<com.google.android.material.textview.MaterialTextView
301+
android:layout_width="match_parent"
302+
android:layout_height="wrap_content"
303+
android:autoLink="web"
304+
android:textColorLink="@color/blue"
305+
android:text="@string/eula_agree_v2"
306+
android:textAppearance="@android:style/TextAppearance.Material.Small" />
307+
302308
</LinearLayout>
303309

304310
</ScrollView>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,8 @@
403403
<string name="showcase_mode_dialogue_message">An app restart is required to enable showcase mode.</string>
404404
<string name="other_section">Other</string>
405405
<string name="eula_agree">By clicking "finish", you are agreeing to be bound by the LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.en.html) license and the EULA (https://www.androidacy.com/foxmmm-eula/)</string>
406-
<string name="eula_agree_v2">I agree to be bound by the LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.en.html) license and the EULA (https://www.androidacy.com/foxmmm-eula/), in addition to any third party terms.</string>
406+
<string name="eula_agree_v2">You agree to be bound by the LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.en.html) license and the EULA (https://www.androidacy.com/foxmmm-eula/), in addition to any third party terms, and that the authors of this app bear no responsibility of your usage of it, nor do we offer any warranties express or implied.</string>
407+
<string name="eula_sum">I agree to the EULA and License</string>
407408
<string name="analytics_desc">Allow us to track app usage and installs. Fully GDPR compliant and uses Matomo, hosted by Androidacy.</string>
408409
<string name="debug_cat">Debugging</string>
409410
<string name="announcements">News and updates</string>
@@ -414,5 +415,5 @@
414415
<string name="promo_code_copied">Use the copied code for half off your first month!</string>
415416
<string name="warning_pls_restart">Please note that some settings may not take effect until you restart the app.</string>
416417
<string name="reinstall">Reinstall</string>
417-
<string name="setup_scroll_down_v2">To enable the finsih button, scroll to the bottom and acknowledge you have read and agree to the EULA and license(s).</string>
418+
<string name="setup_scroll_down_v2">To enable the finish button, scroll to the bottom and acknowledge you have read and agree to the EULA and license(s).</string>
418419
</resources>

0 commit comments

Comments
 (0)