Skip to content

Commit fe82581

Browse files
committed
Improved the quality of Pr
1 parent 3851d37 commit fe82581

File tree

4 files changed

+223
-198
lines changed

4 files changed

+223
-198
lines changed

app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
android:parentActivityName=".contributions.ContributionsActivity" />
9090

9191
<activity
92-
android:name=".Achievements"
92+
android:name=".achievements.AchievementsActivity"
9393
android:label="@string/Achievements">
9494
<intent-filter>
9595
<category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/fr/free/nrw/commons/Achievements.java renamed to app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

+27-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fr.free.nrw.commons;
1+
package fr.free.nrw.commons.achievements;
22

33
import android.content.Intent;
44
import android.graphics.Bitmap;
@@ -20,37 +20,42 @@
2020

2121
import java.io.File;
2222
import java.io.FileOutputStream;
23+
import java.io.IOException;
2324
import java.util.Random;
2425

26+
import butterknife.BindView;
27+
import butterknife.ButterKnife;
28+
import dagger.Binds;
29+
import fr.free.nrw.commons.R;
2530
import fr.free.nrw.commons.theme.NavigationBaseActivity;
2631

27-
public class Achievements extends AppCompatActivity {
32+
public class AchievementsActivity extends AppCompatActivity {
33+
34+
private static final double BADGE_IMAGE_WIDTH_RATIO = 0.4;
35+
private static final double BADGE_IMAGE_HEIGHT_RATIO = 0.36;
36+
37+
@BindView(R.id.achievement_badge) ImageView imageView;
38+
@BindView(R.id.toolbar) android.support.v7.widget.Toolbar toolbar;
2839

29-
private static final double badge_image_ratio_width = 0.4;
30-
private static final double badge_image_ratio_height = 0.36;
31-
private ImageView imageView;
3240
@Override
3341
protected void onCreate(Bundle savedInstanceState) {
3442
super.onCreate(savedInstanceState);
3543
setContentView(R.layout.activity_achievements);
44+
ButterKnife.bind(this);
3645

3746
DisplayMetrics displayMetrics = new DisplayMetrics();
3847
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
3948
int height = displayMetrics.heightPixels;
4049
int width = displayMetrics.widthPixels;
4150

42-
imageView = (ImageView)findViewById(R.id.achievement_badge);
43-
4451
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams)
4552
imageView.getLayoutParams();
46-
params.height = (int) (height*badge_image_ratio_height);
47-
params.width = (int) (width*badge_image_ratio_width);
53+
params.height = (int) (height*BADGE_IMAGE_HEIGHT_RATIO);
54+
params.width = (int) (width*BADGE_IMAGE_WIDTH_RATIO);
4855
imageView.setImageResource(R.drawable.sydney_opera_house);
4956
imageView.requestLayout();
5057

51-
android.support.v7.widget.Toolbar toolbar = (android.support.v7.widget.Toolbar) findViewById(R.id.toolbar);
5258
setSupportActionBar(toolbar);
53-
5459
}
5560

5661
@Override
@@ -73,6 +78,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
7378
return super.onOptionsItemSelected(item);
7479
}
7580

81+
/**
82+
* To take screenshot of the screen and return it in Bitmap format
83+
* @param view
84+
* @return
85+
*/
7686
public static Bitmap getScreenShot(View view) {
7787
View screenView = view.getRootView();
7888
screenView.setDrawingCacheEnabled(true);
@@ -81,6 +91,10 @@ public static Bitmap getScreenShot(View view) {
8191
return bitmap;
8292
}
8393

94+
/**
95+
* To take bitmap and store it temporary storage and share it
96+
* @param bitmap
97+
*/
8498
void shareScreen ( Bitmap bitmap){
8599
try {
86100
File file = new File(this.getExternalCacheDir(),"screen.png");
@@ -94,11 +108,9 @@ void shareScreen ( Bitmap bitmap){
94108
intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
95109
intent.setType("image/png");
96110
startActivity(Intent.createChooser(intent, "Share image via"));
97-
} catch (Exception e) {
98-
e.printStackTrace();
111+
} catch (IOException e) {
112+
//Do Nothing
99113
}
100114
}
101115

102-
103-
104116
}

0 commit comments

Comments
 (0)