Skip to content

Commit a0c0458

Browse files
committed
upgrade api version and add app version to about dialog
1 parent d825ece commit a0c0458

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

app/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ android {
44
defaultConfig {
55
applicationId "io.scalaproject.vault"
66
buildToolsVersion = '34.0.0'
7-
compileSdk 34
7+
compileSdk 35
88
minSdk 23
9-
//noinspection OldTargetApi
10-
targetSdk 34
11-
versionCode 18
12-
versionName "1.2.1"
9+
targetSdk 35
10+
versionCode 19
11+
versionName "1.2.2"
1312

1413
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1514
externalNativeBuild {
@@ -139,14 +138,14 @@ java {
139138
}
140139

141140
dependencies {
142-
implementation 'com.google.android.material:material:1.12.0' // keep version 1.0.0 as it fixes a bug with Material Button
141+
implementation 'com.google.android.material:material:1.12.0'
143142
implementation "com.android.support:support-v4"
144143
implementation "com.android.support:recyclerview-v7"
145144
implementation 'androidx.cardview:cardview:1.0.0'
146145
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
147146

148-
implementation 'com.google.android.material:material:1.12.0' // keep version 1.1.0 as it fixes a bug with Material Button
149-
implementation 'androidx.appcompat:appcompat:1.7.0' // keep version 1.1.0 as it fixes a bug with Material Button
147+
implementation 'com.google.android.material:material:1.12.0'
148+
implementation 'androidx.appcompat:appcompat:1.7.1'
150149
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
151150

152151
implementation 'me.dm7.barcodescanner:zxing:1.9.8'

app/src/main/java/io/scalaproject/vault/dialog/CreditsFragment.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
import java.util.Objects;
4747

48+
import io.scalaproject.vault.BuildConfig;
4849
import io.scalaproject.vault.R;
4950

5051
public class CreditsFragment extends DialogFragment {
@@ -77,6 +78,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
7778
tvmonerujoURL.setText(Html.fromHtml(getString(R.string.monerujoLink)));
7879
tvmonerujoURL.setMovementMethod(LinkMovementMethod.getInstance());
7980

81+
TextView tvappVersion = view.findViewById(R.id.appVersion);
82+
tvappVersion.setText(BuildConfig.VERSION_NAME);
83+
8084
Button btnDownloadMM = view.findViewById(R.id.btnDownloadMM);
8185
btnDownloadMM.setOnClickListener(new View.OnClickListener() {
8286
@Override

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,17 @@
149149
app:iconTint="@color/btn_icon_default"
150150
app:icon="@drawable/ic_download"/>
151151

152+
<TextView
153+
android:id="@+id/appVersion"
154+
android:layout_width="wrap_content"
155+
android:layout_height="wrap_content"
156+
android:layout_marginBottom="5dp"
157+
android:text="version"
158+
android:layout_gravity="center"
159+
android:textSize="16sp"
160+
android:textColor="@color/c_white"
161+
android:textStyle="bold"
162+
android:layout_marginTop="20sp"/>
163+
152164
</LinearLayout>
153165
</ScrollView>

0 commit comments

Comments
 (0)