Skip to content
This repository was archived by the owner on Mar 11, 2021. It is now read-only.

Commit 18b49e4

Browse files
TaviscoTavisco
committed
Add: App updates now redirects to github page
1 parent a5d1fb6 commit 18b49e4

File tree

12 files changed

+40
-24
lines changed

12 files changed

+40
-24
lines changed

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "io.github.tavisco.rvglassistant"
77
minSdkVersion 21
88
targetSdkVersion 27
9-
versionCode 1
10-
versionName "18.0701"
9+
versionCode 2
10+
versionName "R18.0825"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1212
vectorDrawables.useSupportLibrary = true
1313
}

‎app/src/main/java/io/github/tavisco/rvglassistant/CarInfoActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class CarInfoActivity extends AppCompatActivity {
5252
@Override
5353
protected void onCreate(Bundle savedInstanceState) {
5454
super.onCreate(savedInstanceState);
55-
setContentView(R.layout.cool);
55+
setContentView(R.layout.item_details);
5656

5757
// Title container
5858
mTitleContainer = findViewById(R.id.activity_detail_title_container);

‎app/src/main/java/io/github/tavisco/rvglassistant/fragments/MainFragment.java‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public class MainFragment extends Fragment {
8686

8787

8888
// =-=-=-= Items/Variables =-=-=-=
89-
boolean gameUpdateAvaiable = false;
90-
UpdateStatus appUpdateStatus = UpdateStatus.NOT_INSTALLED;
89+
UpdateStatus gameUpdateStatus = UpdateStatus.ERROR;
90+
UpdateStatus appUpdateStatus = UpdateStatus.ERROR;
9191

9292

9393
public MainFragment() {
@@ -138,17 +138,15 @@ public void onDestroy() {
138138

139139
@Override
140140
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
141-
// checkForUpdates();
142-
MainFragmentPermissionsDispatcher.checkForUpdatesWithPermissionCheck(this);
141+
// checkForGameUpdates();
142+
MainFragmentPermissionsDispatcher.checkForGameUpdatesWithPermissionCheck(this);
143143
// createPackagesList();
144144
MainFragmentPermissionsDispatcher.createPackagesListWithPermissionCheck(this);
145145

146146
checkForAppUpdates();
147147
}
148148

149149
private void checkForAppUpdates() {
150-
// TODO: Click on this card opens github page, and a dialog to alert the update
151-
152150
tvAppInstalledVersion.setText(String.format(getString(R.string.main_installed_version),
153151
BuildConfig.VERSION_NAME));
154152

@@ -170,16 +168,20 @@ private void checkForAppUpdates() {
170168
} else {
171169
appUpdateStatus = UpdateStatus.UPDATE_AVAIABLE;
172170
cardAppUpdateVersions.setCardBackgroundColor(ctx.getResources().getColor(R.color.newVersionRed));
171+
new MaterialDialog.Builder(ctx)
172+
.title("Update avaiable!")
173+
.content("There's a new version of the APP avaiable!\nDownload now?")
174+
.positiveText(R.string.yes)
175+
.negativeText(R.string.no)
176+
.onPositive((dialog, which) -> clickCardAppUpdate())
177+
.show();
173178
}
174179
}
175180
}, error -> Log.d(Constants.TAG, error.getLocalizedMessage()));
176181

177182
// Add the request to the RequestQueue.
178183
queue.add(stringRequest);
179184
}
180-
181-
182-
183185
}
184186

185187
@Override
@@ -243,7 +245,7 @@ public void populateRecycler() {
243245
}
244246

245247
@NeedsPermission({Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE})
246-
public void checkForUpdates(){
248+
public void checkForGameUpdates(){
247249
final String localVersion = getLocalGameVersion();
248250

249251
Activity activity = getActivity();
@@ -334,23 +336,34 @@ public void compareWithLocalVersion(String localVersion, String lastVersion){
334336
cardUpdate.setCardBackgroundColor(getResources().getColor(R.color.updatedGreen));
335337
tvUpdateStatus.setText(R.string.main_you_are_up_to_date);
336338
imgUpdateStatus.setImageDrawable(getResources().getDrawable(R.drawable.ic_cloud_check));
339+
gameUpdateStatus = UpdateStatus.UPDATED;
337340
} else {
338341
cardUpdate.setCardBackgroundColor(getResources().getColor(R.color.newVersionRed));
339342
tvUpdateStatus.setText(String.format(getString(R.string.main_update_avaiable), lastVersion));
340343
imgUpdateStatus.setImageDrawable(getResources().getDrawable(R.drawable.ic_cloud_download));
341-
gameUpdateAvaiable = true;
344+
gameUpdateStatus = UpdateStatus.UPDATE_AVAIABLE;
342345
}
343346
}
344347
}
345348
}
346349

347350
@OnClick(R.id.card_main_updateStatus)
348-
public void clickCardUpdate(){
349-
if (gameUpdateAvaiable){
351+
public void clickCardGameUpdate(){
352+
if (gameUpdateStatus == UpdateStatus.UPDATE_AVAIABLE){
350353
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.RVGL_ANDROID_APK_LINK));
351354
startActivity(browserIntent);
352355
} else {
353-
checkForUpdates();
356+
checkForGameUpdates();
357+
}
358+
}
359+
360+
@OnClick(R.id.card_main_appUpdateVersions)
361+
public void clickCardAppUpdate(){
362+
if (appUpdateStatus == UpdateStatus.UPDATE_AVAIABLE){
363+
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.APP_RELEASES_LINK));
364+
startActivity(browserIntent);
365+
} else {
366+
checkForGameUpdates();
354367
}
355368
}
356369

‎app/src/main/java/io/github/tavisco/rvglassistant/objects/IOPackageItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ public void install(MainFragment frag) {
163163
new MaterialDialog.Builder(ctx)
164164
.title("Download ".concat(getName()).concat("?"))
165165
.content("Do you wish to download ".concat(getName()).concat(" pack?"))
166-
.positiveText(R.string.agree)
167-
.negativeText(R.string.disagree)
166+
.positiveText(R.string.yes)
167+
.negativeText(R.string.no)
168168
.onPositive((dialog, which) -> downloadPackage(frag))
169169
.show();
170170
}

‎app/src/main/java/io/github/tavisco/rvglassistant/objects/adapters/CarViewItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public int getType() {
5050
*/
5151
@Override
5252
public int getLayoutRes() {
53-
return R.layout.track_item;
53+
return R.layout.item_on_recycler;
5454
}
5555

5656
/**

‎app/src/main/java/io/github/tavisco/rvglassistant/objects/adapters/LevelViewItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public int getType() {
5252
*/
5353
@Override
5454
public int getLayoutRes() {
55-
return R.layout.track_item;
55+
return R.layout.item_on_recycler;
5656
}
5757

5858
/**

‎app/src/main/java/io/github/tavisco/rvglassistant/others/Constants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class Constants {
2424
public static final String RVIO_ASSETS_LINK = "https://distribute.re-volt.io/assets/";
2525
public static final String RVIO_DOWNLOAD_PACKS_LINK = "https://distribute.re-volt.io/packs/";
2626
public static final String APP_LAST_VERSION_LINK = "https://raw.githubusercontent.com/Tavisco/RVGL-Assistant_Android/master/last_version.txt";
27+
public static final String APP_RELEASES_LINK = "https://github.com/Tavisco/RVGL-Assistant_Android/releases";
2728

2829
//Files
2930
public static final String RVGL_CURRENT_VERSION_TXT = "rvgl_version.txt";

app/src/main/res/layout/cool.xml renamed to app/src/main/res/layout/item_details.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
android:background="@drawable/animated_ripple"
9393
android:elevation="3dp"
9494
android:transitionName="fab"
95+
android:visibility="gone"
9596
/>
9697

9798
<ImageButton
@@ -107,6 +108,7 @@
107108
android:background="@drawable/animated_ripple"
108109
android:elevation="4dp"
109110
android:transitionName="fab"
111+
android:visibility="gone"
110112
/>
111113

112114
</RelativeLayout>

app/src/main/res/layout/track_item.xml renamed to app/src/main/res/layout/item_on_recycler.xml

File renamed without changes.

0 commit comments

Comments
 (0)