Skip to content

Commit 8434283

Browse files
git03-Nguyengit03-Nguyen
authored
Merge pull request #78 from git03-Nguyen/dev
Dev
2 parents 4e51e9e + 9f981f2 commit 8434283

38 files changed

+40
-52
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
android:exported="false"
121121
android:launchMode="singleTop" />
122122
<activity
123-
android:name=".SplashScreen"
123+
android:name=".SplashScreenActivity"
124124
android:exported="true" >
125125
<intent-filter>
126126
<action android:name="android.intent.action.MAIN" />

app/src/main/java/edu/team08/infinitegallery/SplashScreen.java renamed to app/src/main/java/edu/team08/infinitegallery/SplashScreenActivity.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22

33
import static android.Manifest.permission.ACCESS_NETWORK_STATE;
44
import static android.Manifest.permission.INTERNET;
5-
import static android.Manifest.permission.MANAGE_EXTERNAL_STORAGE;
65
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
76
import static android.Manifest.permission.READ_MEDIA_IMAGES;
8-
import static android.Manifest.permission.SET_WALLPAPER;
97
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
108
import static android.os.Build.VERSION.SDK_INT;
119

1210
import androidx.annotation.NonNull;
13-
import androidx.annotation.Nullable;
1411
import androidx.appcompat.app.AppCompatActivity;
1512
import androidx.core.app.ActivityCompat;
1613
import androidx.core.content.ContextCompat;
@@ -28,7 +25,7 @@
2825

2926
import edu.team08.infinitegallery.main.MainActivity;
3027

31-
public class SplashScreen extends AppCompatActivity {
28+
public class SplashScreenActivity extends AppCompatActivity {
3229
private final int PERMISSIONS_REQUEST_CODE_1 = 1001;
3330
private final int PERMISSIONS_REQUEST_CODE_2 = 1002;
3431
@Override
@@ -51,7 +48,7 @@ private void requestAppPermissions() {
5148
String networkPermission = ACCESS_NETWORK_STATE;
5249

5350
String[] permissions = new String[] {readPermission, writePermission, internetPermission, networkPermission};
54-
ActivityCompat.requestPermissions(SplashScreen.this, permissions, PERMISSIONS_REQUEST_CODE_1);
51+
ActivityCompat.requestPermissions(SplashScreenActivity.this, permissions, PERMISSIONS_REQUEST_CODE_1);
5552

5653
}
5754

@@ -86,7 +83,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
8683
boolean successful = grantResults.length > 0;
8784
if (successful) {
8885
if (grantResults[0] == PackageManager.PERMISSION_DENIED) {
89-
Toast.makeText(SplashScreen.this, R.string.permissions_denied, Toast.LENGTH_SHORT).show();
86+
Toast.makeText(SplashScreenActivity.this, R.string.permissions_denied, Toast.LENGTH_SHORT).show();
9087
finish();
9188
}
9289
successful = successful && (grantResults[0] == PackageManager.PERMISSION_GRANTED);
@@ -129,11 +126,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
129126
}
130127

131128
private void startApplication() {
132-
MediaScannerConnection.scanFile(SplashScreen.this, new String[] { Environment.getExternalStorageDirectory().getAbsolutePath() }, new String[] {"image/*"}, new MediaScannerConnection.OnScanCompletedListener() {
129+
MediaScannerConnection.scanFile(SplashScreenActivity.this, new String[] { Environment.getExternalStorageDirectory().getAbsolutePath() }, new String[] {"image/*"}, new MediaScannerConnection.OnScanCompletedListener() {
133130
public void onScanCompleted(String path, Uri uri) {
134131
Log.i("ExternalStorage", "Scanned " + path + ":");
135132
Log.i("ExternalStorage", "-> uri=" + uri);
136-
Intent intent = new Intent(SplashScreen.this, MainActivity.class);
133+
Intent intent = new Intent(SplashScreenActivity.this, MainActivity.class);
137134
startActivity(intent);
138135
finish();
139136
}

‎app/src/main/java/edu/team08/infinitegallery/helpers/DataBridge.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package edu.team08.infinitegallery.helpers;
22

33
public class DataBridge {
4-
public static String[] photos;
4+
public static String[] photoStrings;
55
}

‎app/src/main/java/edu/team08/infinitegallery/helpers/ProgressDialogBuilder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import edu.team08.infinitegallery.R;
1212

1313
public class ProgressDialogBuilder {
14-
1514
public static Dialog buildProgressDialog(Context context, String title, Runnable backgroundWork, Runnable onDismiss) {
1615
Dialog progressDialog = new Dialog(context);
1716
progressDialog.setContentView(R.layout.dialog_progress_bar);

‎app/src/main/java/edu/team08/infinitegallery/main/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private void initApp() {
9494
photosFragment = PhotosFragment.newInstance();
9595
albumsFragment = AlbumsFragment.newInstance();
9696
searchFragment = SearchFragment.newInstance(MainActivity.this);
97-
moreFragment = MoreFragment.newInstance(MainActivity.this);
97+
moreFragment = MoreFragment.newInstance();
9898
currentFragment = photosFragment;
9999
getSupportFragmentManager()
100100
.beginTransaction()

‎app/src/main/java/edu/team08/infinitegallery/optionmore/MoreFragment.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,18 @@ public class MoreFragment extends Fragment {
4444
FavoriteManager favoriteManager;
4545
TextView favText, trashText;
4646

47-
public MoreFragment(Context context) {
48-
this.context = context;
47+
public MoreFragment() {
48+
// required empty
4949
}
5050

51-
public static MoreFragment newInstance(Context context) {
52-
return new MoreFragment(context);
51+
public static MoreFragment newInstance() {
52+
return new MoreFragment();
5353
}
5454

5555
@Override
5656
public void onCreate(Bundle savedInstanceState) {
5757
super.onCreate(savedInstanceState);
58+
this.context = getActivity();
5859
}
5960

6061
@Nullable

‎app/src/main/java/edu/team08/infinitegallery/optionphotos/PhotosAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void onClick(View v) {
123123
}
124124
if (myIntent != null) {
125125
// myIntent.putExtra("photoPaths", photoPaths);
126-
DataBridge.photos = photoPaths;
126+
DataBridge.photoStrings = photoPaths;
127127
myIntent.putExtra("currentPosition", position);
128128
startActivity(context, myIntent, null);
129129
}

‎app/src/main/java/edu/team08/infinitegallery/optionphotos/PhotosFragment.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ public void onActivityResult(ActivityResult result) {
119119

120120
public PhotosFragment() {}
121121

122-
public PhotosFragment(Context context) {
123-
this.context = context;
124-
}
125-
126122
public static PhotosFragment newInstance() {
127123
PhotosFragment fragment = new PhotosFragment();
128124
return fragment;

‎app/src/main/java/edu/team08/infinitegallery/privacy/PrivacyChangePatternActivity.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.app.Dialog;
44
import android.content.Context;
5-
import android.content.Intent;
65
import android.content.SharedPreferences;
76
import android.os.Bundle;
87
import android.util.Log;
@@ -18,14 +17,11 @@
1817
import com.andrognito.patternlockview.listener.PatternLockViewListener;
1918
import com.andrognito.patternlockview.utils.PatternLockUtils;
2019

21-
import java.io.File;
22-
import java.io.IOException;
2320
import java.util.List;
2421

2522
import edu.team08.infinitegallery.R;
2623
import edu.team08.infinitegallery.helpers.ConfirmDialogBuilder;
2724
import edu.team08.infinitegallery.helpers.ProgressDialogBuilder;
28-
import edu.team08.infinitegallery.main.MainActivity;
2925

3026
public class PrivacyChangePatternActivity extends AppCompatActivity {
3127
//Properties and attributes
@@ -39,7 +35,7 @@ public class PrivacyChangePatternActivity extends AppCompatActivity {
3935
//on- methods
4036
public void onCreate(@Nullable Bundle savedInstanceState) {
4137
super.onCreate(savedInstanceState);
42-
setContentView(R.layout.privacy_login_pattern);
38+
setContentView(R.layout.pattern_privacy_login);
4339

4440
//set toolbar
4541
setSupportActionBar(findViewById(R.id.toolbarForPrivacyPattern));

‎app/src/main/java/edu/team08/infinitegallery/privacy/PrivacyForgetPassActivity.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import android.os.Bundle;
77
import android.text.method.HideReturnsTransformationMethod;
88
import android.text.method.PasswordTransformationMethod;
9-
import android.util.Log;
109
import android.view.View;
1110
import android.widget.ArrayAdapter;
1211
import android.widget.Button;
@@ -55,7 +54,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
5554
super.onCreate(savedInstanceState);
5655
// setContentView(R.layout.privacy_forget_password_form);
5756

58-
setContentView(R.layout.privacy_modify_password_form);
57+
setContentView(R.layout.form_privacy_modify_password);
5958
//set toolbar
6059
// setSupportActionBar(findViewById(R.id.toolbarForPrivacyForgetPassword));
6160
setSupportActionBar(findViewById(R.id.toolbarForPrivacyModifyingPassword));

0 commit comments

Comments
 (0)