From 737144f5561ba7095c1462a28281d34f7b5c96aa Mon Sep 17 00:00:00 2001 From: M M Arif Date: Sun, 2 Oct 2022 11:25:37 +0500 Subject: [PATCH] Update libs, use M3 switch --- app/build.gradle | 13 ++++---- app/src/main/AndroidManifest.xml | 3 +- .../SettingsAppearanceActivity.java | 12 +++---- .../activities/SettingsSecurityActivity.java | 21 +++++++----- .../layout/activity_settings_appearance.xml | 10 +++--- .../res/layout/activity_settings_drafts.xml | 13 ++++---- .../res/layout/activity_settings_general.xml | 5 ++- .../activity_settings_notifications.xml | 33 +++++++++---------- .../res/layout/activity_settings_reports.xml | 11 +++---- .../res/layout/activity_settings_security.xml | 5 ++- .../res/layout/bottom_sheet_organization.xml | 2 +- app/src/main/res/layout/bottom_sheet_repo.xml | 2 +- ...stom_repository_edit_properties_dialog.xml | 20 +++++------ build.gradle | 2 +- 14 files changed, 73 insertions(+), 79 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6d79b9d5..d14ed873 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,11 +4,11 @@ plugins { apply plugin: 'com.android.application' android { - compileSdkVersion 32 + compileSdkVersion 33 defaultConfig { applicationId "org.mian.gitnex" minSdkVersion 23 - targetSdkVersion 32 + targetSdkVersion 33 versionCode 495 versionName "5.0.0-dev" multiDexEnabled true @@ -42,6 +42,7 @@ android { lint { abortOnError false } + namespace 'org.mian.gitnex' defaultConfig { vectorDrawables.useSupportLibrary = true } @@ -60,9 +61,9 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.compose.material3:material3:1.0.0-alpha15' - implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha15' + implementation 'com.google.android.material:material:1.8.0-alpha01' + implementation 'androidx.compose.material3:material3:1.0.0-beta03' + implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-beta03' implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.legacy:legacy-support-v4:1.0.0" @@ -80,7 +81,7 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.squareup.retrofit2:converter-scalars:2.9.0' implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2' - implementation 'org.ocpsoft.prettytime:prettytime:5.0.2.Final' + implementation 'org.ocpsoft.prettytime:prettytime:5.0.4.Final' implementation 'com.github.Pes8:android-material-color-picker-dialog:master' implementation "io.noties.markwon:core:$markwon_version" implementation "io.noties.markwon:ext-latex:$markwon_version" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index deb90e81..bfa94ba0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java index 14714352..9588302e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java @@ -10,7 +10,6 @@ import android.widget.TimePicker; import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.google.android.material.switchmaterial.SwitchMaterial; import org.mian.gitnex.R; import org.mian.gitnex.databinding.ActivitySettingsAppearanceBinding; import org.mian.gitnex.fragments.SettingsFragment; @@ -47,8 +46,6 @@ public class SettingsAppearanceActivity extends BaseActivity { activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame; LinearLayout darkTimeFrame = activitySettingsAppearanceBinding.darkThemeTimeSelectionFrame; - SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge; - customFontList = getResources().getStringArray(R.array.fonts); themeList = getResources().getStringArray(R.array.themes); @@ -94,16 +91,19 @@ public class SettingsAppearanceActivity extends BaseActivity { lightTimeFrame.setVisibility(View.GONE); } - counterBadgesSwitch.setChecked(tinyDB.getBoolean("enableCounterBadges", true)); + activitySettingsAppearanceBinding.switchCounterBadge.setChecked( + tinyDB.getBoolean("enableCounterBadges", true)); // counter badge switcher - counterBadgesSwitch.setOnCheckedChangeListener( + activitySettingsAppearanceBinding.switchCounterBadge.setOnCheckedChangeListener( (buttonView, isChecked) -> { tinyDB.putBoolean("enableCounterBadges", isChecked); Toasty.success(appCtx, getResources().getString(R.string.settingsSave)); }); activitySettingsAppearanceBinding.counterBadgeFrame.setOnClickListener( - v -> counterBadgesSwitch.setChecked(!counterBadgesSwitch.isChecked())); + v -> + activitySettingsAppearanceBinding.switchCounterBadge.setChecked( + !activitySettingsAppearanceBinding.switchCounterBadge.isChecked())); // show labels in lists(issues, pr) - default is color dots activitySettingsAppearanceBinding.switchLabelsInListBadge.setChecked( diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java index 8c23121f..0dfcc60a 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java @@ -13,7 +13,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.biometric.BiometricManager; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.google.android.material.switchmaterial.SwitchMaterial; import java.io.File; import java.io.IOException; import org.apache.commons.io.FileUtils; @@ -63,8 +62,6 @@ public class SettingsSecurityActivity extends BaseActivity { activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame; LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame; - SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric; - cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList); cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList); @@ -86,10 +83,11 @@ public class SettingsSecurityActivity extends BaseActivity { cacheSizeImagesSelectedChoice = tinyDB.getInt("cacheSizeImagesId"); } - switchBiometric.setChecked(tinyDB.getBoolean("biometricStatus", false)); + activitySettingsSecurityBinding.switchBiometric.setChecked( + tinyDB.getBoolean("biometricStatus", false)); // biometric switcher - switchBiometric.setOnCheckedChangeListener( + activitySettingsSecurityBinding.switchBiometric.setOnCheckedChangeListener( (buttonView, isChecked) -> { if (isChecked) { @@ -112,7 +110,8 @@ public class SettingsSecurityActivity extends BaseActivity { case BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED: case BiometricManager.BIOMETRIC_STATUS_UNKNOWN: tinyDB.putBoolean("biometricStatus", false); - switchBiometric.setChecked(false); + activitySettingsSecurityBinding.switchBiometric.setChecked( + false); Toasty.error( appCtx, getResources() @@ -120,7 +119,8 @@ public class SettingsSecurityActivity extends BaseActivity { break; case BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE: tinyDB.putBoolean("biometricStatus", false); - switchBiometric.setChecked(false); + activitySettingsSecurityBinding.switchBiometric.setChecked( + false); Toasty.error( appCtx, getResources() @@ -128,7 +128,8 @@ public class SettingsSecurityActivity extends BaseActivity { break; case BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED: tinyDB.putBoolean("biometricStatus", false); - switchBiometric.setChecked(false); + activitySettingsSecurityBinding.switchBiometric.setChecked( + false); Toasty.info( appCtx, getResources().getString(R.string.enrollBiometric)); @@ -147,7 +148,9 @@ public class SettingsSecurityActivity extends BaseActivity { }); activitySettingsSecurityBinding.biometricFrame.setOnClickListener( - v -> switchBiometric.setChecked(!switchBiometric.isChecked())); + v -> + activitySettingsSecurityBinding.switchBiometric.setChecked( + !activitySettingsSecurityBinding.switchBiometric.isChecked())); // clear cache setter File cacheDir = appCtx.getCacheDir(); diff --git a/app/src/main/res/layout/activity_settings_appearance.xml b/app/src/main/res/layout/activity_settings_appearance.xml index c398f61f..1e54371e 100644 --- a/app/src/main/res/layout/activity_settings_appearance.xml +++ b/app/src/main/res/layout/activity_settings_appearance.xml @@ -199,7 +199,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="@dimen/dimen18sp"/> - + android:paddingEnd="@dimen/dimen24dp" /> @@ -246,13 +245,12 @@ android:gravity="center_vertical|end" android:orientation="horizontal"> - + android:paddingEnd="@dimen/dimen24dp" /> diff --git a/app/src/main/res/layout/activity_settings_drafts.xml b/app/src/main/res/layout/activity_settings_drafts.xml index 42a1dc8b..9ed3e627 100644 --- a/app/src/main/res/layout/activity_settings_drafts.xml +++ b/app/src/main/res/layout/activity_settings_drafts.xml @@ -32,7 +32,7 @@ android:contentDescription="@string/close" android:focusable="true" android:gravity="center_vertical" - android:src="@drawable/ic_close"/> + android:src="@drawable/ic_close" /> + android:textSize="@dimen/dimen20sp" /> @@ -71,7 +71,7 @@ android:layout_marginStart="@dimen/dimen24dp" android:text="@string/settingsEnableCommentsDeletionText" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> - + android:paddingEnd="@dimen/dimen24dp" /> @@ -100,7 +99,7 @@ android:layout_marginEnd="@dimen/dimen72dp" android:text="@string/settingsEnableCommentsDeletionHintText" android:textColor="?attr/hintColor" - android:textSize="@dimen/dimen12sp"/> + android:textSize="@dimen/dimen12sp" /> diff --git a/app/src/main/res/layout/activity_settings_general.xml b/app/src/main/res/layout/activity_settings_general.xml index d11b3e5a..72284639 100644 --- a/app/src/main/res/layout/activity_settings_general.xml +++ b/app/src/main/res/layout/activity_settings_general.xml @@ -142,7 +142,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="@dimen/dimen18sp"/> - + android:paddingEnd="@dimen/dimen24dp" /> diff --git a/app/src/main/res/layout/activity_settings_notifications.xml b/app/src/main/res/layout/activity_settings_notifications.xml index a8a79d4e..66da9727 100644 --- a/app/src/main/res/layout/activity_settings_notifications.xml +++ b/app/src/main/res/layout/activity_settings_notifications.xml @@ -34,7 +34,7 @@ android:contentDescription="@string/close" android:focusable="true" android:gravity="center_vertical" - android:src="@drawable/ic_close"/> + android:src="@drawable/ic_close" /> + android:textSize="@dimen/dimen20sp" /> @@ -68,7 +68,7 @@ android:layout_marginStart="@dimen/dimen24dp" android:text="@string/enableNotificationsHeaderText" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> - + android:paddingEnd="@dimen/dimen24dp" /> @@ -106,7 +105,7 @@ android:layout_marginEnd="@dimen/dimen24dp" android:text="@string/notificationsPollingHeaderText" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> + android:textSize="@dimen/dimen16sp" /> @@ -137,9 +136,9 @@ android:layout_marginEnd="@dimen/dimen24dp" android:text="@string/enableLightsHeaderText" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> - + android:paddingEnd="@dimen/dimen24dp" /> @@ -170,7 +168,7 @@ android:layout_marginEnd="@dimen/dimen24dp" android:text="@string/chooseColorSelectorHeader" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> + app:cardElevation="@dimen/dimen0dp" /> @@ -203,9 +201,9 @@ android:layout_marginEnd="@dimen/dimen72dp" android:text="@string/enableVibrationHeaderText" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> - + android:paddingEnd="@dimen/dimen24dp" /> diff --git a/app/src/main/res/layout/activity_settings_reports.xml b/app/src/main/res/layout/activity_settings_reports.xml index 94e67a88..c9d1d384 100644 --- a/app/src/main/res/layout/activity_settings_reports.xml +++ b/app/src/main/res/layout/activity_settings_reports.xml @@ -31,7 +31,7 @@ android:contentDescription="@string/close" android:focusable="true" android:gravity="center_vertical" - android:src="@drawable/ic_close"/> + android:src="@drawable/ic_close" /> + android:textSize="@dimen/dimen20sp" /> @@ -65,7 +65,7 @@ android:layout_marginStart="@dimen/dimen24dp" android:text="@string/settingsEnableReportsText" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen18sp"/> + android:textSize="@dimen/dimen18sp" /> - + android:paddingEnd="@dimen/dimen24dp" /> diff --git a/app/src/main/res/layout/activity_settings_security.xml b/app/src/main/res/layout/activity_settings_security.xml index a0eb08b6..35967f02 100644 --- a/app/src/main/res/layout/activity_settings_security.xml +++ b/app/src/main/res/layout/activity_settings_security.xml @@ -66,7 +66,7 @@ android:textColor="?attr/primaryTextColor" android:textSize="@dimen/dimen18sp"/> - + android:paddingEnd="@dimen/dimen24dp" /> diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml index d3bf335b..4627f382 100644 --- a/app/src/main/res/layout/bottom_sheet_organization.xml +++ b/app/src/main/res/layout/bottom_sheet_organization.xml @@ -79,7 +79,7 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:gravity="center" android:padding="4dp" - android:text="@string/label" + android:text="@string/labelTxt" android:textColor="?attr/primaryTextColor" android:textSize="16sp" app:drawableTopCompat="@drawable/ic_tag" diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml index 387f565d..f2eba77e 100644 --- a/app/src/main/res/layout/bottom_sheet_repo.xml +++ b/app/src/main/res/layout/bottom_sheet_repo.xml @@ -79,7 +79,7 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:gravity="center" android:padding="4dp" - android:text="@string/label" + android:text="@string/labelTxt" android:textColor="?attr/primaryTextColor" android:textSize="16sp" app:drawableTopCompat="@drawable/ic_tag" diff --git a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml index c7e04953..de923556 100644 --- a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml +++ b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml @@ -99,7 +99,7 @@ - - - - - - - - - -