Skip to content

Feature/space main #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hb7829 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/space main #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37d751d
update replaceFragment
hb7829 Aug 14, 2020
26245d5
Merge branch 'master' into feature/space_main
hb7829 Aug 14, 2020
33bc154
add followService
hb7829 Aug 14, 2020
76464b9
Merge branch 'master' into feature/space_main
hb7829 Aug 14, 2020
de53544
revise
hb7829 Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions DdamiApp/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ android {
dependencies {
//implementation 'com.android.support:design:28.0.0'

def nav_version = "2.3.0-rc01"
def nav_version = '2.3.0'
def kotlin_version = "1.3.72"
def retrofitVersion = "2.6.4"
def retrofitVersion = '2.9.0'

implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.navigation:navigation-fragment:2.3.0'
implementation 'androidx.navigation:navigation-ui:2.3.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

Expand Down Expand Up @@ -74,7 +74,7 @@ dependencies {
implementation 'com.squareup.picasso:picasso:2.71828'

//circle image
implementation 'de.hdodenhof:circleimageview:2.1.0'
implementation 'de.hdodenhof:circleimageview:3.1.0'


//retrofit
Expand All @@ -84,18 +84,19 @@ dependencies {

//rx
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'io.reactivex.rxjava2:rxjava:2.2.16'
implementation "io.reactivex.rxjava2:rxkotlin:2.3.0"
implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

implementation 'com.android.volley:volley:1.1.0'
implementation 'com.google.code.gson:gson:2.3.1'
implementation 'com.google.code.gson:gson:2.8.6'

//push alarm
implementation 'com.google.android.gms:play-services-auth:17.0.0'
implementation 'com.google.firebase:firebase-messaging:20.0.1'
implementation 'com.google.android.gms:play-services-auth:18.1.0'
implementation 'com.google.firebase:firebase-messaging:20.2.4'


}
repositories {
mavenCentral()
}

29 changes: 17 additions & 12 deletions DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import androidx.appcompat.widget.Toolbar;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.ui.AppBarConfiguration;
Expand Down Expand Up @@ -53,9 +54,10 @@ public class MainActivity extends AppCompatActivity {
BottomNavigationView bottomNavigationView;
Button btn_verification;
TextView nav_main, nav_myroom, nav_like, nav_shop, nav_purchase, nav_shop_like, nav_activities, nav_interested_activities, nav_settings;
TextView nav_header_program;
TextView nav_header_program, nav_tv_name;
ImageView nav_profile_img;
Fragment fragment;
String token;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -64,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
initViews();

String id = getIntent().getStringExtra("id");
String token = getIntent().getStringExtra("token");
token = getIntent().getStringExtra("token");

Toast.makeText(this, "id = " + id + "token = " + token, Toast.LENGTH_LONG).show();

Expand All @@ -80,20 +82,19 @@ protected void onCreate(Bundle savedInstanceState) {
nav_settings = (TextView) findViewById(R.id.nav_settings);
nav_header_program = (TextView) findViewById(R.id.nav_header_program);
nav_profile_img = (ImageView) findViewById(R.id.nav_profile_img);

nav_tv_name = (TextView) findViewById(R.id.textView_name);
Bundle bundle = new Bundle();

JsonObject input = new JsonObject();
String token2 = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZjMxMzlhOGNiMGUwZjQyZDBhMDJiOWEiLCJ1c2VySWQiOiJ0ZXN0IiwiaWF0IjoxNTk3MjU0MjgzLCJleHAiOjE1OTc4NTkwODMsImlzcyI6ImRkYW1pLmNvbSIsInN1YiI6InVzZXJJbmZvIn0.vXZr-6P0IQXNYaknHIgqBhXUlOnknobDU9uY2ojPVGk";
input.addProperty("token", token2);
input.addProperty("token", token);
ApiService.INSTANCE.getMyroomUser().myroom(input)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
it -> {
Log.e("sss@@@!!!", it.toString());
bundle.putBoolean("Myroom", true);
bundle.putString("Id", it.getMyInfo().getUserId());
bundle.putString("UserId", it.getMyInfo().getUserId());
for (int i = 0; i < it.getMyInfo().getLikeField().size(); i++) {
bundle.putString("LikeField" + String.valueOf(i), it.getMyInfo().getLikeField().get(i).toString());
}
Expand All @@ -109,16 +110,18 @@ protected void onCreate(Bundle savedInstanceState) {
bundle.putString("ProfileImg", it.getMyInfo().getImageUrl());
bundle.putString("Program", it.getMyInfo().getStudent().getDepartment());

//set profile img
//set profile nav_profile
Picasso.get().load(it.getMyInfo().getImageUrl()).into(nav_profile_img);
nav_tv_name.setText(it.getMyInfo().getUserName());

},
it -> {
Log.e("fff@@@!!!", it.toString());
}
);

JsonObject input_v = new JsonObject();
input_v.addProperty("token", token2);
input_v.addProperty("token", token);
ApiService.INSTANCE.getMyInfo().myinfo(input_v)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
Expand Down Expand Up @@ -160,6 +163,7 @@ public void onClick(View v) {
public void onClick(View v) {
MyRoomFragment myroom = new MyRoomFragment();
drawerLayout.closeDrawers();
bundle.putString("token", token);
myroom.setArguments(bundle);
replaceFragment(myroom);
}
Expand Down Expand Up @@ -251,9 +255,8 @@ public void onClick(View v) {

//화면 전환
public void replaceFragment(Fragment fr) {
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
if(fragment != null)
getSupportFragmentManager().beginTransaction().remove(fragment).add(R.id.nav_host_fragment,fr).commit();
getSupportFragmentManager().popBackStack();
getSupportFragmentManager().beginTransaction().add(R.id.nav_host_fragment, fr).addToBackStack("a").commit();
}

private void initViews() {
Expand Down Expand Up @@ -319,6 +322,8 @@ public void setActionBarTitle(String title) {

//open verifiedActivity
private void openNewActivity() {
startActivity(new Intent(getApplicationContext(), VerificationActivity.class));
Intent intent = new Intent(getApplicationContext(), VerificationActivity.class);
intent.putExtra("token", token);
startActivity(intent);
}
}
108 changes: 59 additions & 49 deletions DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,58 +24,68 @@ class LoginActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)

keyboardVisibilityUtils = KeyboardVisibilityUtils(window,
onShowKeyboard = { keyboardHeight ->
sv_login.run {
smoothScrollTo(scrollX, scrollY + keyboardHeight)
}
})

btn_sign_up.setOnClickListener {
val id = et_id.text.toString()
val pw = et_name.text.toString()
val inputJson = JsonObject()

inputJson.addProperty("userId", id)
inputJson.addProperty("userPassword", pw)

login(inputJson)
}

tv_signUp.setOnClickListener {
val signUpIntent = Intent(this@LoginActivity, SignUpActivity::class.java)
startActivity(signUpIntent)
}
val intent = Intent(this@LoginActivity, MainActivity::class.java)
startActivity(intent)
finish()
}

@SuppressLint("CheckResult")
fun login(input: JsonObject) {
ApiService.loginService.login(input)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
Toast.makeText(applicationContext, "로그인 성공", Toast.LENGTH_SHORT).show()
val intent = Intent(this@LoginActivity, MainActivity::class.java)
intent.putExtra("token", it.token)
intent.putExtra("id", input.get("userId").toString())
startActivity(intent)
finish()
}, {
Toast.makeText(applicationContext, "$it", Toast.LENGTH_SHORT).show()
Log.e("영환", it.toString())
})
}

override fun onBackPressed() {
if (supportFragmentManager.backStackEntryCount == 0) {
if (System.currentTimeMillis() - backTime < 2000) {
finish()
}
Toast.makeText(this, "종료하시려면 다시한번 눌러주세요.", Toast.LENGTH_SHORT).show()
backTime = System.currentTimeMillis()
} else {
supportFragmentManager.popBackStack()
}
}

// val intent = Intent(this@LoginActivity, MainActivity::class.java)
//
// keyboardVisibilityUtils = KeyboardVisibilityUtils(window,
// onShowKeyboard = { keyboardHeight ->
// sv_login.run {
// smoothScrollTo(scrollX, scrollY + keyboardHeight)
// }
// })
//
// btn_sign_up.setOnClickListener {
// val id = et_id.text.toString()
// val pw = et_name.text.toString()
// val inputJson = JsonObject()
//
// inputJson.addProperty("userId", id)
// inputJson.addProperty("userPassword", pw)
//
// login(inputJson)
// }
//
// tv_signUp.setOnClickListener {
// val signUpIntent = Intent(this@LoginActivity, SignUpActivity::class.java)
// startActivity(signUpIntent)
// }
// }
//
// @SuppressLint("CheckResult")
// fun login(input: JsonObject) {
// ApiService.loginService.login(input)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe({
// Toast.makeText(applicationContext, "로그인 성공", Toast.LENGTH_SHORT).show()
// val intent = Intent(this@LoginActivity, MainActivity::class.java)
// intent.putExtra("token", it.token)
// intent.putExtra("id", input.get("userId").toString())
// startActivity(intent)
// finish()
// }, {
// Toast.makeText(applicationContext, "$it", Toast.LENGTH_SHORT).show()
// Log.e("영환", it.toString())
// })
// }
//
// override fun onBackPressed() {
// if (supportFragmentManager.backStackEntryCount == 0) {
// if (System.currentTimeMillis() - backTime < 2000) {
// finish()
// }
// Toast.makeText(this, "종료하시려면 다시한번 눌러주세요.", Toast.LENGTH_SHORT).show()
// backTime = System.currentTimeMillis()
// } else {
// supportFragmentManager.popBackStack()
// }
// }

}
12 changes: 9 additions & 3 deletions ...pp/src/main/java/com/doubleslash/ddamiapp/activity/verification/VerificationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.provider.Settings;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
Expand All @@ -28,8 +29,12 @@
import com.doubleslash.ddamiapp.activity.MainActivity;
import com.doubleslash.ddamiapp.network.kotlin.ApiService;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.squareup.picasso.Picasso;

import org.json.JSONArray;
import org.json.JSONObject;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -50,14 +55,16 @@ public class VerificationActivity extends AppCompatActivity implements View.OnCl
File tempFile = null;
String pictureFilePath;
EditText et_school, et_program, et_studentId;
List<String> likeFields = new ArrayList<String>();
JSONArray likeFields = new JSONArray();
String token;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_verification);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

token=getIntent().getStringExtra("token");
btn_modern = (Button) findViewById(R.id.btn_modern_art);
btn_graphic = (Button) findViewById(R.id.btn_graphic_design);
btn_craft = (Button) findViewById(R.id.btn_craft_art);
Expand Down Expand Up @@ -144,7 +151,7 @@ public void onClick(View view) {

public void addIfSelected(Button b) {
if(b.isSelected()) {
likeFields.add(b.getText().toString());
likeFields.put(b.getText().toString());
}
}

Expand Down Expand Up @@ -272,7 +279,6 @@ private void showMsg(int i) {
}

private void verify(JsonObject inputJson) {
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZjMxMzlhOGNiMGUwZjQyZDBhMDJiOWEiLCJ1c2VySWQiOiJ0ZXN0IiwiaWF0IjoxNTk3MjU0MjgzLCJleHAiOjE1OTc4NTkwODMsImlzcyI6ImRkYW1pLmNvbSIsInN1YiI6InVzZXJJbmZvIn0.vXZr-6P0IQXNYaknHIgqBhXUlOnknobDU9uY2ojPVGk";
inputJson.addProperty("token", token);
ApiService.INSTANCE.getVerifyUser().verify(inputJson)
.subscribeOn(Schedulers.io())
Expand Down
41 changes: 41 additions & 0 deletions ...pp/app/src/main/java/com/doubleslash/ddamiapp/activity/verification/VerifiedActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.doubleslash.ddamiapp.activity.verification;

import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;

import androidx.appcompat.app.AppCompatActivity;

import com.doubleslash.ddamiapp.R;
import com.doubleslash.ddamiapp.activity.MainActivity;

public class VerifiedActivity extends AppCompatActivity {
Button btn_goto_main;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_verified);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

btn_goto_main = (Button) findViewById(R.id.btn_goto_main);
btn_goto_main.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
goToMain();
}
});
}

public void goToMain() {
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
}

@Override
public boolean onNavigateUp() {
finish();
return true;
}
}
Loading