mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Code style
This commit is contained in:
@@ -24,8 +24,6 @@ public class QrActivity extends BaseActionBarActivity {
|
||||
|
||||
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
|
||||
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
|
||||
private ViewPager viewPager;
|
||||
private TabLayout tabLayout;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
@@ -34,16 +32,16 @@ public class QrActivity extends BaseActionBarActivity {
|
||||
dynamicLanguage.onCreate(this);
|
||||
|
||||
setContentView(R.layout.activity_qr);
|
||||
this.tabLayout = ViewUtil.findById(this, R.id.tab_layout);
|
||||
this.viewPager = ViewUtil.findById(this, R.id.pager);
|
||||
this.viewPager.setAdapter(new ProfilePagerAdapter(getSupportFragmentManager()));
|
||||
TabLayout tabLayout = ViewUtil.findById(this, R.id.tab_layout);
|
||||
ViewPager viewPager = ViewUtil.findById(this, R.id.pager);
|
||||
viewPager.setAdapter(new ProfilePagerAdapter(getSupportFragmentManager()));
|
||||
|
||||
setSupportActionBar(ViewUtil.findById(this, R.id.toolbar));
|
||||
assert getSupportActionBar() != null;
|
||||
getSupportActionBar().setTitle(R.string.qrscan_title);
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
|
||||
this.tabLayout.setupWithViewPager(viewPager);
|
||||
tabLayout.setupWithViewPager(viewPager);
|
||||
|
||||
}
|
||||
|
||||
@@ -68,7 +66,7 @@ public class QrActivity extends BaseActionBarActivity {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
|
||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||
Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
|
||||
}
|
||||
|
||||
@@ -83,14 +81,13 @@ public class QrActivity extends BaseActionBarActivity {
|
||||
private class ProfilePagerAdapter extends FragmentStatePagerAdapter {
|
||||
|
||||
ProfilePagerAdapter(FragmentManager fragmentManager) {
|
||||
super(fragmentManager);
|
||||
super(fragmentManager, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public Fragment getItem(int position) {
|
||||
Fragment fragment;
|
||||
Bundle args = new Bundle();
|
||||
|
||||
switch (position) {
|
||||
case 0:
|
||||
|
||||
@@ -20,13 +20,8 @@ public class QrShowActivity extends AppCompatActivity {
|
||||
private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); //needs to stay when using qrShowFragment because I deleted it there
|
||||
|
||||
public final static int WHITE = 0xFFFFFFFF;
|
||||
public final static int BLACK = 0xFF000000;
|
||||
public final static int WIDTH = 400;
|
||||
public final static int HEIGHT = 400;
|
||||
public final static String CHAT_ID = "chat_id";
|
||||
|
||||
//public int numJoiners;
|
||||
|
||||
DcEventCenter dcEventCenter;
|
||||
|
||||
ApplicationDcContext dcContext;
|
||||
|
||||
@@ -36,16 +36,16 @@ import org.thoughtcrime.securesms.connect.DcHelper;
|
||||
public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDelegate {
|
||||
|
||||
public final static int WHITE = 0xFFFFFFFF;
|
||||
public final static int BLACK = 0xFF000000;
|
||||
public final static int WIDTH = 400;
|
||||
public final static int HEIGHT = 400;
|
||||
public final static String CHAT_ID = "chat_id";
|
||||
private final static int BLACK = 0xFF000000;
|
||||
private final static int WIDTH = 400;
|
||||
private final static int HEIGHT = 400;
|
||||
private final static String CHAT_ID = "chat_id";
|
||||
|
||||
public int numJoiners;
|
||||
private int numJoiners;
|
||||
|
||||
DcEventCenter dcEventCenter;
|
||||
private DcEventCenter dcEventCenter;
|
||||
|
||||
ApplicationDcContext dcContext;
|
||||
private ApplicationDcContext dcContext;
|
||||
|
||||
private String hint;
|
||||
|
||||
@@ -143,7 +143,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
|
||||
getActivity().unregisterReceiver(broadcastReceiver);
|
||||
}
|
||||
|
||||
Bitmap encodeAsBitmap(String str) throws WriterException {
|
||||
private Bitmap encodeAsBitmap(String str) throws WriterException {
|
||||
BitMatrix result;
|
||||
try {
|
||||
result = new MultiFormatWriter().encode(str,
|
||||
@@ -172,7 +172,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
public void putOverlay(Bitmap bitmap, Bitmap overlay) {
|
||||
private void putOverlay(Bitmap bitmap, Bitmap overlay) {
|
||||
int bw = bitmap.getWidth();
|
||||
int bh = bitmap.getHeight();
|
||||
int ow = bw / 6;
|
||||
@@ -206,7 +206,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
|
||||
if (progress == 1000) {
|
||||
numJoiners--;
|
||||
if (numJoiners <= 0) {
|
||||
getActivity().finish();
|
||||
if (getActivity() != null) getActivity().finish();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user