diff --git a/app/src/main/java/com/stardust/scriptdroid/network/UserService.java b/app/src/main/java/com/stardust/scriptdroid/network/UserService.java index d499f7f3..58ce7ec6 100644 --- a/app/src/main/java/com/stardust/scriptdroid/network/UserService.java +++ b/app/src/main/java/com/stardust/scriptdroid/network/UserService.java @@ -1,19 +1,15 @@ package com.stardust.scriptdroid.network; -import com.google.gson.GsonBuilder; -import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; +import android.util.Log; + +import com.stardust.scriptdroid.network.api.ConfigApi; import com.stardust.scriptdroid.network.api.UserApi; -import com.stardust.scriptdroid.network.entity.TokenResponse; -import com.stardust.scriptdroid.network.entity.VerifyResponse; + +import java.util.Collections; import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.annotations.NonNull; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import okhttp3.ResponseBody; import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; /** * Created by Stardust on 2017/9/20. @@ -28,20 +24,19 @@ public class UserService { mRetrofit = NodeBB.getInstance().getRetrofit(); } + public static UserService getInstance() { + return sInstance; + } - public Observable login(String userName, final String password) { - final UserApi userApi = mRetrofit.create(UserApi.class); - return userApi.verify(userName, password) - .subscribeOn(Schedulers.io()) - .flatMap(new Function>() { - @Override - public ObservableSource apply(@NonNull VerifyResponse verifyResponse) throws Exception { - if (verifyResponse.isSuccessful()) { - return userApi.generateToken(verifyResponse.getUid(), password); - } else { - return Observable.error(new Exception(verifyResponse.getMessage())); - } - } + public Observable login(String userName, final String password) { + return mRetrofit.create(ConfigApi.class) + .getConfig() + .flatMap(config -> { + Log.d("login", config.toString()); + return mRetrofit.create(UserApi.class) + .login(Collections.singletonMap("x-csrf-token", config.getCsrfToken()), + userName, password); }); + } } diff --git a/app/src/main/java/com/stardust/scriptdroid/network/api/ConfigApi.java b/app/src/main/java/com/stardust/scriptdroid/network/api/ConfigApi.java new file mode 100644 index 00000000..1dbd7752 --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/network/api/ConfigApi.java @@ -0,0 +1,17 @@ +package com.stardust.scriptdroid.network.api; + +import com.stardust.scriptdroid.network.entity.config.Config; + +import io.reactivex.Observable; +import retrofit2.http.GET; + +/** + * Created by Stardust on 2017/10/26. + */ + +public interface ConfigApi { + + @GET("/api/config") + Observable getConfig(); + +} diff --git a/app/src/main/java/com/stardust/scriptdroid/network/api/UserApi.java b/app/src/main/java/com/stardust/scriptdroid/network/api/UserApi.java index b7f64159..2b4a909e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/network/api/UserApi.java +++ b/app/src/main/java/com/stardust/scriptdroid/network/api/UserApi.java @@ -1,15 +1,16 @@ package com.stardust.scriptdroid.network.api; -import com.stardust.scriptdroid.network.entity.VerifyResponse; -import com.stardust.scriptdroid.network.entity.TokenResponse; -import com.stardust.scriptdroid.network.entity.User; +import com.stardust.scriptdroid.network.entity.user.User; + +import java.util.Map; import io.reactivex.Observable; +import okhttp3.ResponseBody; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; +import retrofit2.http.HeaderMap; import retrofit2.http.POST; -import retrofit2.http.Path; /** * Created by Stardust on 2017/9/20. @@ -21,14 +22,8 @@ public interface UserApi { Observable me(); @FormUrlEncoded - @POST("/api/ns/login") - Observable verify(@Field("username") String userName, @Field("password") String password); - - - @FormUrlEncoded - @POST("/api/v2/{uid}/tokens") - Observable generateToken(@Path("uid") String uid, @Field("password") String password); - + @POST("/login") + Observable login(@HeaderMap Map csrfToken, @Field("username") String userName, @Field("password") String password); } diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/TokenResponse.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/TokenResponse.java deleted file mode 100644 index e87ad11e..00000000 --- a/app/src/main/java/com/stardust/scriptdroid/network/entity/TokenResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.stardust.scriptdroid.network.entity; - -/** - * Created by Stardust on 2017/9/21. - */ - -public class TokenResponse { - - public String code; - - public static class Payload { - - public String token; - } - - -} diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/VerifyResponse.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/VerifyResponse.java deleted file mode 100644 index 56cefbff..00000000 --- a/app/src/main/java/com/stardust/scriptdroid/network/entity/VerifyResponse.java +++ /dev/null @@ -1,376 +0,0 @@ -package com.stardust.scriptdroid.network.entity; - -import com.google.gson.annotations.SerializedName; - -public class VerifyResponse { - - @SerializedName("message") - private String message; - - @SerializedName("birthday") - private String birthday; - - @SerializedName("lastposttime") - private String lastposttime; - - @SerializedName("signature") - private String signature; - - @SerializedName("icon:bgColor") - private String iconBgColor; - - @SerializedName("groupTitle") - private String groupTitle; - - @SerializedName("reputation") - private String reputation; - - @SerializedName("followingCount") - private String followingCount; - - @SerializedName("lastonlineISO") - private String lastonlineISO; - - @SerializedName("uid") - private String uid; - - @SerializedName("profileviews") - private String profileviews; - - @SerializedName("icon:text") - private String iconText; - - @SerializedName("banned") - private String banned; - - @SerializedName("userslug") - private String userslug; - - @SerializedName("followerCount") - private String followerCount; - - @SerializedName("email") - private String email; - - @SerializedName("joindate") - private String joindate; - - @SerializedName("website") - private String website; - - @SerializedName("uploadedpicture") - private String uploadedpicture; - - @SerializedName("passwordExpiry") - private String passwordExpiry; - - @SerializedName("lastonline") - private String lastonline; - - @SerializedName("picture") - private String picture; - - @SerializedName("joindateISO") - private String joindateISO; - - @SerializedName("email:confirmed") - private Object emailConfirmed; - - @SerializedName("postcount") - private String postcount; - - @SerializedName("location") - private String location; - - @SerializedName("fullname") - private String fullname; - - @SerializedName("topiccount") - private String topiccount; - - @SerializedName("username") - private String username; - - @SerializedName("status") - private String status; - - public boolean isSuccessful() { - return message == null; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public void setBirthday(String birthday) { - this.birthday = birthday; - } - - public String getBirthday() { - return birthday; - } - - public void setLastposttime(String lastposttime) { - this.lastposttime = lastposttime; - } - - public String getLastposttime() { - return lastposttime; - } - - public void setSignature(String signature) { - this.signature = signature; - } - - public String getSignature() { - return signature; - } - - public void setIconBgColor(String iconBgColor) { - this.iconBgColor = iconBgColor; - } - - public String getIconBgColor() { - return iconBgColor; - } - - public void setGroupTitle(String groupTitle) { - this.groupTitle = groupTitle; - } - - public String getGroupTitle() { - return groupTitle; - } - - public void setReputation(String reputation) { - this.reputation = reputation; - } - - public String getReputation() { - return reputation; - } - - public void setFollowingCount(String followingCount) { - this.followingCount = followingCount; - } - - public String getFollowingCount() { - return followingCount; - } - - public void setLastonlineISO(String lastonlineISO) { - this.lastonlineISO = lastonlineISO; - } - - public String getLastonlineISO() { - return lastonlineISO; - } - - public void setUid(String uid) { - this.uid = uid; - } - - public String getUid() { - return uid; - } - - public void setProfileviews(String profileviews) { - this.profileviews = profileviews; - } - - public String getProfileviews() { - return profileviews; - } - - public void setIconText(String iconText) { - this.iconText = iconText; - } - - public String getIconText() { - return iconText; - } - - public void setBanned(String banned) { - this.banned = banned; - } - - public String getBanned() { - return banned; - } - - public void setUserslug(String userslug) { - this.userslug = userslug; - } - - public String getUserslug() { - return userslug; - } - - public void setFollowerCount(String followerCount) { - this.followerCount = followerCount; - } - - public String getFollowerCount() { - return followerCount; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getEmail() { - return email; - } - - public void setJoindate(String joindate) { - this.joindate = joindate; - } - - public String getJoindate() { - return joindate; - } - - public void setWebsite(String website) { - this.website = website; - } - - public String getWebsite() { - return website; - } - - public void setUploadedpicture(String uploadedpicture) { - this.uploadedpicture = uploadedpicture; - } - - public String getUploadedpicture() { - return uploadedpicture; - } - - public void setPasswordExpiry(String passwordExpiry) { - this.passwordExpiry = passwordExpiry; - } - - public String getPasswordExpiry() { - return passwordExpiry; - } - - public void setLastonline(String lastonline) { - this.lastonline = lastonline; - } - - public String getLastonline() { - return lastonline; - } - - public void setPicture(String picture) { - this.picture = picture; - } - - public String getPicture() { - return picture; - } - - public void setJoindateISO(String joindateISO) { - this.joindateISO = joindateISO; - } - - public String getJoindateISO() { - return joindateISO; - } - - public void setEmailConfirmed(Object emailConfirmed) { - this.emailConfirmed = emailConfirmed; - } - - public Object getEmailConfirmed() { - return emailConfirmed; - } - - public void setPostcount(String postcount) { - this.postcount = postcount; - } - - public String getPostcount() { - return postcount; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getLocation() { - return location; - } - - public void setFullname(String fullname) { - this.fullname = fullname; - } - - public String getFullname() { - return fullname; - } - - public void setTopiccount(String topiccount) { - this.topiccount = topiccount; - } - - public String getTopiccount() { - return topiccount; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUsername() { - return username; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatus() { - return status; - } - - @Override - public String toString() { - return - "VerifyResponse{" + - "birthday = '" + birthday + '\'' + - ",lastposttime = '" + lastposttime + '\'' + - ",signature = '" + signature + '\'' + - ",icon:bgColor = '" + iconBgColor + '\'' + - ",groupTitle = '" + groupTitle + '\'' + - ",reputation = '" + reputation + '\'' + - ",followingCount = '" + followingCount + '\'' + - ",lastonlineISO = '" + lastonlineISO + '\'' + - ",uid = '" + uid + '\'' + - ",profileviews = '" + profileviews + '\'' + - ",icon:text = '" + iconText + '\'' + - ",banned = '" + banned + '\'' + - ",userslug = '" + userslug + '\'' + - ",followerCount = '" + followerCount + '\'' + - ",email = '" + email + '\'' + - ",joindate = '" + joindate + '\'' + - ",website = '" + website + '\'' + - ",uploadedpicture = '" + uploadedpicture + '\'' + - ",passwordExpiry = '" + passwordExpiry + '\'' + - ",lastonline = '" + lastonline + '\'' + - ",picture = '" + picture + '\'' + - ",joindateISO = '" + joindateISO + '\'' + - ",email:confirmed = '" + emailConfirmed + '\'' + - ",postcount = '" + postcount + '\'' + - ",location = '" + location + '\'' + - ",fullname = '" + fullname + '\'' + - ",topiccount = '" + topiccount + '\'' + - ",username = '" + username + '\'' + - ",status = '" + status + '\'' + - "}"; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Config.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Config.java new file mode 100644 index 00000000..13c75416 --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Config.java @@ -0,0 +1,617 @@ +package com.stardust.scriptdroid.network.entity.config; + +import java.util.List; +import com.google.gson.annotations.SerializedName; + +public class Config{ + + + @SerializedName("socketioTransports") + private List socketioTransports; + + @SerializedName("allowGuestSearching") + private boolean allowGuestSearching; + + @SerializedName("hasImageUploadPlugin") + private boolean hasImageUploadPlugin; + + @SerializedName("showSiteTitle") + private boolean showSiteTitle; + + @SerializedName("websocketAddress") + private String websocketAddress; + + @SerializedName("maximumFileSize") + private String maximumFileSize; + + @SerializedName("usePagination") + private boolean usePagination; + + @SerializedName("minimumPostLength") + private String minimumPostLength; + + @SerializedName("allowGuestUserSearching") + private boolean allowGuestUserSearching; + + @SerializedName("allowTopicsThumbnail") + private boolean allowTopicsThumbnail; + + @SerializedName("allowGuestHandles") + private boolean allowGuestHandles; + + @SerializedName("disableChatMessageEditing") + private boolean disableChatMessageEditing; + + @SerializedName("version") + private String version; + + @SerializedName("minimumTitleLength") + private String minimumTitleLength; + + @SerializedName("maximumTagsPerTopic") + private int maximumTagsPerTopic; + + @SerializedName("topicPostSort") + private String topicPostSort; + + @SerializedName("defaultBootswatchSkin") + private String defaultBootswatchSkin; + + @SerializedName("allowFileUploads") + private boolean allowFileUploads; + + @SerializedName("maximumPostLength") + private String maximumPostLength; + + @SerializedName("loggedIn") + private boolean loggedIn; + + @SerializedName("postsPerPage") + private String postsPerPage; + + + @SerializedName("relative_path") + private String relativePath; + + @SerializedName("requireEmailConfirmation") + private boolean requireEmailConfirmation; + + @SerializedName("defaultLang") + private String defaultLang; + + @SerializedName("disableChat") + private boolean disableChat; + + @SerializedName("userLang") + private String userLang; + + @SerializedName("maxReconnectionAttempts") + private int maxReconnectionAttempts; + + @SerializedName("timeagoCutoff") + private String timeagoCutoff; + + @SerializedName("browserTitle") + private String browserTitle; + + @SerializedName("siteTitle") + private String siteTitle; + + @SerializedName("csrf_token") + private String csrfToken; + + @SerializedName("categoryTopicSort") + private String categoryTopicSort; + + @SerializedName("disableMasonry") + private boolean disableMasonry; + + @SerializedName("theme:src") + private String themeSrc; + + @SerializedName("cookies") + private Cookies cookies; + + @SerializedName("markdown") + private Markdown markdown; + + @SerializedName("minimumTagLength") + private String minimumTagLength; + + @SerializedName("maximumTagLength") + private String maximumTagLength; + + @SerializedName("maximumTitleLength") + private String maximumTitleLength; + + @SerializedName("topicsPerPage") + private String topicsPerPage; + + @SerializedName("useOutgoingLinksPage") + private boolean useOutgoingLinksPage; + + @SerializedName("bootswatchSkin") + private String bootswatchSkin; + + @SerializedName("minimumTagsPerTopic") + private int minimumTagsPerTopic; + + @SerializedName("delayImageLoading") + private boolean delayImageLoading; + + @SerializedName("cache-buster") + private String cacheBuster; + + @SerializedName("titleLayout") + private String titleLayout; + + @SerializedName("theme:id") + private String themeId; + + @SerializedName("topicSearchEnabled") + private boolean topicSearchEnabled; + + @SerializedName("searchEnabled") + private boolean searchEnabled; + + @SerializedName("reconnectionDelay") + private int reconnectionDelay; + + + public void setSocketioTransports(List socketioTransports){ + this.socketioTransports = socketioTransports; + } + + public List getSocketioTransports(){ + return socketioTransports; + } + + public void setAllowGuestSearching(boolean allowGuestSearching){ + this.allowGuestSearching = allowGuestSearching; + } + + public boolean isAllowGuestSearching(){ + return allowGuestSearching; + } + + public void setHasImageUploadPlugin(boolean hasImageUploadPlugin){ + this.hasImageUploadPlugin = hasImageUploadPlugin; + } + + public boolean isHasImageUploadPlugin(){ + return hasImageUploadPlugin; + } + + public void setShowSiteTitle(boolean showSiteTitle){ + this.showSiteTitle = showSiteTitle; + } + + public boolean isShowSiteTitle(){ + return showSiteTitle; + } + + public void setWebsocketAddress(String websocketAddress){ + this.websocketAddress = websocketAddress; + } + + public String getWebsocketAddress(){ + return websocketAddress; + } + + public void setMaximumFileSize(String maximumFileSize){ + this.maximumFileSize = maximumFileSize; + } + + public String getMaximumFileSize(){ + return maximumFileSize; + } + + public void setUsePagination(boolean usePagination){ + this.usePagination = usePagination; + } + + public boolean isUsePagination(){ + return usePagination; + } + + public void setMinimumPostLength(String minimumPostLength){ + this.minimumPostLength = minimumPostLength; + } + + public String getMinimumPostLength(){ + return minimumPostLength; + } + + public void setAllowGuestUserSearching(boolean allowGuestUserSearching){ + this.allowGuestUserSearching = allowGuestUserSearching; + } + + public boolean isAllowGuestUserSearching(){ + return allowGuestUserSearching; + } + + public void setAllowTopicsThumbnail(boolean allowTopicsThumbnail){ + this.allowTopicsThumbnail = allowTopicsThumbnail; + } + + public boolean isAllowTopicsThumbnail(){ + return allowTopicsThumbnail; + } + + public void setAllowGuestHandles(boolean allowGuestHandles){ + this.allowGuestHandles = allowGuestHandles; + } + + public boolean isAllowGuestHandles(){ + return allowGuestHandles; + } + + public void setDisableChatMessageEditing(boolean disableChatMessageEditing){ + this.disableChatMessageEditing = disableChatMessageEditing; + } + + public boolean isDisableChatMessageEditing(){ + return disableChatMessageEditing; + } + + public void setVersion(String version){ + this.version = version; + } + + public String getVersion(){ + return version; + } + + public void setMinimumTitleLength(String minimumTitleLength){ + this.minimumTitleLength = minimumTitleLength; + } + + public String getMinimumTitleLength(){ + return minimumTitleLength; + } + + public void setMaximumTagsPerTopic(int maximumTagsPerTopic){ + this.maximumTagsPerTopic = maximumTagsPerTopic; + } + + public int getMaximumTagsPerTopic(){ + return maximumTagsPerTopic; + } + + public void setTopicPostSort(String topicPostSort){ + this.topicPostSort = topicPostSort; + } + + public String getTopicPostSort(){ + return topicPostSort; + } + + public void setDefaultBootswatchSkin(String defaultBootswatchSkin){ + this.defaultBootswatchSkin = defaultBootswatchSkin; + } + + public String getDefaultBootswatchSkin(){ + return defaultBootswatchSkin; + } + + public void setAllowFileUploads(boolean allowFileUploads){ + this.allowFileUploads = allowFileUploads; + } + + public boolean isAllowFileUploads(){ + return allowFileUploads; + } + + public void setMaximumPostLength(String maximumPostLength){ + this.maximumPostLength = maximumPostLength; + } + + public String getMaximumPostLength(){ + return maximumPostLength; + } + + public void setLoggedIn(boolean loggedIn){ + this.loggedIn = loggedIn; + } + + public boolean isLoggedIn(){ + return loggedIn; + } + + public void setPostsPerPage(String postsPerPage){ + this.postsPerPage = postsPerPage; + } + + public String getPostsPerPage(){ + return postsPerPage; + } + + public void setRelativePath(String relativePath){ + this.relativePath = relativePath; + } + + public String getRelativePath(){ + return relativePath; + } + + public void setRequireEmailConfirmation(boolean requireEmailConfirmation){ + this.requireEmailConfirmation = requireEmailConfirmation; + } + + public boolean isRequireEmailConfirmation(){ + return requireEmailConfirmation; + } + + public void setDefaultLang(String defaultLang){ + this.defaultLang = defaultLang; + } + + public String getDefaultLang(){ + return defaultLang; + } + + public void setDisableChat(boolean disableChat){ + this.disableChat = disableChat; + } + + public boolean isDisableChat(){ + return disableChat; + } + + public void setUserLang(String userLang){ + this.userLang = userLang; + } + + public String getUserLang(){ + return userLang; + } + + public void setMaxReconnectionAttempts(int maxReconnectionAttempts){ + this.maxReconnectionAttempts = maxReconnectionAttempts; + } + + public int getMaxReconnectionAttempts(){ + return maxReconnectionAttempts; + } + + public void setTimeagoCutoff(String timeagoCutoff){ + this.timeagoCutoff = timeagoCutoff; + } + + public String getTimeagoCutoff(){ + return timeagoCutoff; + } + + public void setBrowserTitle(String browserTitle){ + this.browserTitle = browserTitle; + } + + public String getBrowserTitle(){ + return browserTitle; + } + + public void setSiteTitle(String siteTitle){ + this.siteTitle = siteTitle; + } + + public String getSiteTitle(){ + return siteTitle; + } + + public void setCsrfToken(String csrfToken){ + this.csrfToken = csrfToken; + } + + public String getCsrfToken(){ + return csrfToken; + } + + public void setCategoryTopicSort(String categoryTopicSort){ + this.categoryTopicSort = categoryTopicSort; + } + + public String getCategoryTopicSort(){ + return categoryTopicSort; + } + + public void setDisableMasonry(boolean disableMasonry){ + this.disableMasonry = disableMasonry; + } + + public boolean isDisableMasonry(){ + return disableMasonry; + } + + public void setThemeSrc(String themeSrc){ + this.themeSrc = themeSrc; + } + + public String getThemeSrc(){ + return themeSrc; + } + + public void setCookies(Cookies cookies){ + this.cookies = cookies; + } + + public Cookies getCookies(){ + return cookies; + } + + public void setMarkdown(Markdown markdown){ + this.markdown = markdown; + } + + public Markdown getMarkdown(){ + return markdown; + } + + public void setMinimumTagLength(String minimumTagLength){ + this.minimumTagLength = minimumTagLength; + } + + public String getMinimumTagLength(){ + return minimumTagLength; + } + + public void setMaximumTagLength(String maximumTagLength){ + this.maximumTagLength = maximumTagLength; + } + + public String getMaximumTagLength(){ + return maximumTagLength; + } + + public void setMaximumTitleLength(String maximumTitleLength){ + this.maximumTitleLength = maximumTitleLength; + } + + public String getMaximumTitleLength(){ + return maximumTitleLength; + } + + public void setTopicsPerPage(String topicsPerPage){ + this.topicsPerPage = topicsPerPage; + } + + public String getTopicsPerPage(){ + return topicsPerPage; + } + + public void setUseOutgoingLinksPage(boolean useOutgoingLinksPage){ + this.useOutgoingLinksPage = useOutgoingLinksPage; + } + + public boolean isUseOutgoingLinksPage(){ + return useOutgoingLinksPage; + } + + public void setBootswatchSkin(String bootswatchSkin){ + this.bootswatchSkin = bootswatchSkin; + } + + public String getBootswatchSkin(){ + return bootswatchSkin; + } + + public void setMinimumTagsPerTopic(int minimumTagsPerTopic){ + this.minimumTagsPerTopic = minimumTagsPerTopic; + } + + public int getMinimumTagsPerTopic(){ + return minimumTagsPerTopic; + } + + public void setDelayImageLoading(boolean delayImageLoading){ + this.delayImageLoading = delayImageLoading; + } + + public boolean isDelayImageLoading(){ + return delayImageLoading; + } + + public void setCacheBuster(String cacheBuster){ + this.cacheBuster = cacheBuster; + } + + public String getCacheBuster(){ + return cacheBuster; + } + + public void setTitleLayout(String titleLayout){ + this.titleLayout = titleLayout; + } + + public String getTitleLayout(){ + return titleLayout; + } + + public void setThemeId(String themeId){ + this.themeId = themeId; + } + + public String getThemeId(){ + return themeId; + } + + public void setTopicSearchEnabled(boolean topicSearchEnabled){ + this.topicSearchEnabled = topicSearchEnabled; + } + + public boolean isTopicSearchEnabled(){ + return topicSearchEnabled; + } + + public void setSearchEnabled(boolean searchEnabled){ + this.searchEnabled = searchEnabled; + } + + public boolean isSearchEnabled(){ + return searchEnabled; + } + + public void setReconnectionDelay(int reconnectionDelay){ + this.reconnectionDelay = reconnectionDelay; + } + + public int getReconnectionDelay(){ + return reconnectionDelay; + } + + @Override + public String toString(){ + return + "Config{" + + ",socketioTransports = '" + socketioTransports + '\'' + + ",allowGuestSearching = '" + allowGuestSearching + '\'' + + ",hasImageUploadPlugin = '" + hasImageUploadPlugin + '\'' + + ",showSiteTitle = '" + showSiteTitle + '\'' + + ",websocketAddress = '" + websocketAddress + '\'' + + ",maximumFileSize = '" + maximumFileSize + '\'' + + ",usePagination = '" + usePagination + '\'' + + ",minimumPostLength = '" + minimumPostLength + '\'' + + ",allowGuestUserSearching = '" + allowGuestUserSearching + '\'' + + ",allowTopicsThumbnail = '" + allowTopicsThumbnail + '\'' + + ",allowGuestHandles = '" + allowGuestHandles + '\'' + + ",disableChatMessageEditing = '" + disableChatMessageEditing + '\'' + + ",version = '" + version + '\'' + + ",minimumTitleLength = '" + minimumTitleLength + '\'' + + ",maximumTagsPerTopic = '" + maximumTagsPerTopic + '\'' + + ",topicPostSort = '" + topicPostSort + '\'' + + ",defaultBootswatchSkin = '" + defaultBootswatchSkin + '\'' + + ",allowFileUploads = '" + allowFileUploads + '\'' + + ",maximumPostLength = '" + maximumPostLength + '\'' + + ",loggedIn = '" + loggedIn + '\'' + + ",postsPerPage = '" + postsPerPage + '\'' + + ",relative_path = '" + relativePath + '\'' + + ",requireEmailConfirmation = '" + requireEmailConfirmation + '\'' + + ",defaultLang = '" + defaultLang + '\'' + + ",disableChat = '" + disableChat + '\'' + + ",userLang = '" + userLang + '\'' + + ",maxReconnectionAttempts = '" + maxReconnectionAttempts + '\'' + + ",timeagoCutoff = '" + timeagoCutoff + '\'' + + ",browserTitle = '" + browserTitle + '\'' + + ",siteTitle = '" + siteTitle + '\'' + + ",csrf_token = '" + csrfToken + '\'' + + ",categoryTopicSort = '" + categoryTopicSort + '\'' + + ",disableMasonry = '" + disableMasonry + '\'' + + ",theme:src = '" + themeSrc + '\'' + + ",cookies = '" + cookies + '\'' + + ",markdown = '" + markdown + '\'' + + ",minimumTagLength = '" + minimumTagLength + '\'' + + ",maximumTagLength = '" + maximumTagLength + '\'' + + ",maximumTitleLength = '" + maximumTitleLength + '\'' + + ",topicsPerPage = '" + topicsPerPage + '\'' + + ",useOutgoingLinksPage = '" + useOutgoingLinksPage + '\'' + + ",bootswatchSkin = '" + bootswatchSkin + '\'' + + ",minimumTagsPerTopic = '" + minimumTagsPerTopic + '\'' + + ",delayImageLoading = '" + delayImageLoading + '\'' + + ",cache-buster = '" + cacheBuster + '\'' + + ",titleLayout = '" + titleLayout + '\'' + + ",theme:id = '" + themeId + '\'' + + ",topicSearchEnabled = '" + topicSearchEnabled + '\'' + + ",searchEnabled = '" + searchEnabled + '\'' + + ",reconnectionDelay = '" + reconnectionDelay + '\'' + + "}"; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Cookies.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Cookies.java new file mode 100644 index 00000000..da526c22 --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Cookies.java @@ -0,0 +1,62 @@ +package com.stardust.scriptdroid.network.entity.config; + + +import com.google.gson.annotations.SerializedName; + +public class Cookies { + + @SerializedName("link") + private String link; + + @SerializedName("dismiss") + private String dismiss; + + @SerializedName("message") + private String message; + + @SerializedName("enabled") + private boolean enabled; + + public void setLink(String link) { + this.link = link; + } + + public String getLink() { + return link; + } + + public void setDismiss(String dismiss) { + this.dismiss = dismiss; + } + + public String getDismiss() { + return dismiss; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public boolean isEnabled() { + return enabled; + } + + @Override + public String toString() { + return + "Cookies{" + + "link = '" + link + '\'' + + ",dismiss = '" + dismiss + '\'' + + ",message = '" + message + '\'' + + ",enabled = '" + enabled + '\'' + + "}"; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Markdown.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Markdown.java new file mode 100644 index 00000000..be019be9 --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/network/entity/config/Markdown.java @@ -0,0 +1,37 @@ +package com.stardust.scriptdroid.network.entity.config; + +import com.google.gson.annotations.SerializedName; + +public class Markdown{ + + @SerializedName("highlight") + private int highlight; + + @SerializedName("theme") + private String theme; + + public void setHighlight(int highlight){ + this.highlight = highlight; + } + + public int getHighlight(){ + return highlight; + } + + public void setTheme(String theme){ + this.theme = theme; + } + + public String getTheme(){ + return theme; + } + + @Override + public String toString(){ + return + "Markdown{" + + "highlight = '" + highlight + '\'' + + ",theme = '" + theme + '\'' + + "}"; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/GroupsItem.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/user/GroupsItem.java similarity index 98% rename from app/src/main/java/com/stardust/scriptdroid/network/entity/GroupsItem.java rename to app/src/main/java/com/stardust/scriptdroid/network/entity/user/GroupsItem.java index 2c7f5a42..85a7660d 100644 --- a/app/src/main/java/com/stardust/scriptdroid/network/entity/GroupsItem.java +++ b/app/src/main/java/com/stardust/scriptdroid/network/entity/user/GroupsItem.java @@ -1,4 +1,4 @@ -package com.stardust.scriptdroid.network.entity; +package com.stardust.scriptdroid.network.entity.user; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/stardust/scriptdroid/network/entity/User.java b/app/src/main/java/com/stardust/scriptdroid/network/entity/user/User.java similarity index 99% rename from app/src/main/java/com/stardust/scriptdroid/network/entity/User.java rename to app/src/main/java/com/stardust/scriptdroid/network/entity/user/User.java index 5c97da2c..30d433b4 100644 --- a/app/src/main/java/com/stardust/scriptdroid/network/entity/User.java +++ b/app/src/main/java/com/stardust/scriptdroid/network/entity/user/User.java @@ -1,4 +1,4 @@ -package com.stardust.scriptdroid.network.entity; +package com.stardust.scriptdroid.network.entity.user; import java.util.List; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/doc/DocumentationActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/doc/DocumentationActivity.java index cc5b8bd8..25ccd572 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/doc/DocumentationActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/doc/DocumentationActivity.java @@ -1,13 +1,11 @@ package com.stardust.scriptdroid.ui.doc; -import android.app.Activity; import android.webkit.WebView; import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.ui.BaseActivity; -import com.stardust.util.BackPressedHandler; -import com.stardust.widget.EWebView; +import com.stardust.scriptdroid.ui.widget.EWebView; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EActivity; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/doc/ManualDialog.java b/app/src/main/java/com/stardust/scriptdroid/ui/doc/ManualDialog.java index 2062345e..39acedf0 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/doc/ManualDialog.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/doc/ManualDialog.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.scriptdroid.R; -import com.stardust.widget.EWebView; +import com.stardust.scriptdroid.ui.widget.EWebView; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/doc/OnlineDocsFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/doc/OnlineDocsFragment.java index df466fdd..1dc07a27 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/doc/OnlineDocsFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/doc/OnlineDocsFragment.java @@ -1,19 +1,15 @@ package com.stardust.scriptdroid.ui.doc; import android.app.Activity; -import android.content.Context; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; -import android.view.View; import android.webkit.WebView; import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.ui.main.ViewPagerFragment; import com.stardust.util.BackPressedHandler; -import com.stardust.widget.EWebView; +import com.stardust.scriptdroid.ui.widget.EWebView; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EFragment; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java index 087730e9..10fa1658 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditActivity.java @@ -2,20 +2,13 @@ package com.stardust.scriptdroid.ui.edit; import android.content.Context; import android.content.Intent; -import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.widget.DrawerLayout; import android.view.Menu; import android.view.MenuItem; -import com.afollestad.materialdialogs.DialogAction; -import com.afollestad.materialdialogs.MaterialDialog; -import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.model.script.ScriptFile; import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; -import com.stardust.widget.EWebView; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EActivity; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java index c9404ce1..787c1450 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java @@ -27,8 +27,8 @@ import com.stardust.scriptdroid.ui.edit.completion.CodeCompletions; import com.stardust.scriptdroid.ui.edit.completion.CodeCompletionBar; import com.stardust.scriptdroid.ui.edit.completion.InputMethodEnhancedBarColors; import com.stardust.scriptdroid.ui.edit.completion.Symbols; -import com.stardust.widget.EWebView; -import com.stardust.widget.ToolbarMenuItem; +import com.stardust.scriptdroid.ui.widget.EWebView; +import com.stardust.scriptdroid.ui.widget.ToolbarMenuItem; import com.stardust.widget.ViewSwitcher; import org.androidannotations.annotations.AfterViews; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/ViewSampleActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/ViewSampleActivity.java index 709f0387..38867705 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/ViewSampleActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/ViewSampleActivity.java @@ -23,7 +23,7 @@ import com.stardust.scriptdroid.ui.common.ScriptOperations; import com.stardust.theme.ThemeColorManager; import com.stardust.util.AssetsCache; import com.stardust.util.SparseArrayEntries; -import com.stardust.widget.ToolbarMenuItem; +import com.stardust.scriptdroid.ui.widget.ToolbarMenuItem; import butterknife.ButterKnife; import butterknife.OnClick; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/filechooser/FileChooseListView.java b/app/src/main/java/com/stardust/scriptdroid/ui/filechooser/FileChooseListView.java index 31fe13d6..51f7e106 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/filechooser/FileChooseListView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/filechooser/FileChooseListView.java @@ -9,7 +9,6 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.CheckBox; import android.widget.TextView; import com.stardust.pio.PFile; @@ -17,8 +16,8 @@ import com.stardust.pio.PFiles; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.model.script.ScriptFile; import com.stardust.scriptdroid.ui.main.scripts.ScriptListView; -import com.stardust.widget.BindableViewHolder; -import com.stardust.widget.CheckBoxCompat; +import com.stardust.scriptdroid.ui.widget.BindableViewHolder; +import com.stardust.scriptdroid.ui.widget.CheckBoxCompat; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java index 5316ee63..33641dbf 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutBoundsFloatyWindow.java @@ -13,7 +13,7 @@ import com.stardust.enhancedfloaty.FloatyService; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.ui.floating.FullScreenFloatyWindow; import com.stardust.view.accessibility.NodeInfo; -import com.stardust.widget.BubblePopupMenu; +import com.stardust.scriptdroid.ui.widget.BubblePopupMenu; import java.util.Arrays; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java index aba7b08f..aaf89857 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyFloatyWindow.java @@ -11,10 +11,9 @@ import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.Theme; import com.stardust.enhancedfloaty.FloatyService; import com.stardust.scriptdroid.R; -import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.ui.floating.FullScreenFloatyWindow; import com.stardust.view.accessibility.NodeInfo; -import com.stardust.widget.BubblePopupMenu; +import com.stardust.scriptdroid.ui.widget.BubblePopupMenu; import java.util.Arrays; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java index 5efb03c5..9d08ff41 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.stardust.scriptdroid.R; import com.stardust.view.accessibility.NodeInfo; import com.stardust.util.ViewUtil; -import com.stardust.widget.LevelBeamView; +import com.stardust.scriptdroid.ui.widget.LevelBeamView; import java.util.Collections; import java.util.HashSet; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/login/LoginActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/login/LoginActivity.java index 45093339..611ad79c 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/login/LoginActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/login/LoginActivity.java @@ -1,13 +1,10 @@ package com.stardust.scriptdroid.ui.login; -import android.util.Log; import android.widget.TextView; +import android.widget.Toast; import com.stardust.scriptdroid.R; -import com.stardust.scriptdroid.network.NodeBB; -import com.stardust.scriptdroid.network.api.UserApi; -import com.stardust.scriptdroid.network.entity.VerifyResponse; -import com.stardust.scriptdroid.tool.SimpleObserver; +import com.stardust.scriptdroid.network.UserService; import com.stardust.scriptdroid.ui.BaseActivity; import org.androidannotations.annotations.AfterViews; @@ -16,7 +13,6 @@ import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.ViewById; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.annotations.NonNull; import io.reactivex.schedulers.Schedulers; /** @@ -43,24 +39,16 @@ public class LoginActivity extends BaseActivity { if (!checkNotEmpty(userName, password)) { return; } - - NodeBB.getInstance().getRetrofit() - .create(UserApi.class) - .verify(userName, password) + UserService.getInstance().login(userName, password) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SimpleObserver() { + .subscribe(response -> { + Toast.makeText(getApplicationContext(), R.string.text_login_succeed, Toast.LENGTH_SHORT).show(); + finish(); + } + , error -> + Toast.makeText(getApplicationContext(), R.string.text_login_fail, Toast.LENGTH_SHORT).show()); - @Override - public void onNext(@NonNull VerifyResponse verifyResponse) { - Log.d("Login", verifyResponse.toString()); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - } - }); } private boolean checkNotEmpty(String userName, String password) { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java index 40645bb7..719fd3ec 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java @@ -40,9 +40,9 @@ import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.scriptdroid.ui.settings.SettingsActivity_; import com.stardust.scriptdroid.ui.update.VersionGuard; import com.stardust.util.BackPressedHandler; -import com.stardust.view.DrawerAutoClose; -import com.stardust.widget.CommonMarkdownView; -import com.stardust.widget.SearchViewItem; +import com.stardust.util.DrawerAutoClose; +import com.stardust.scriptdroid.ui.widget.CommonMarkdownView; +import com.stardust.scriptdroid.ui.widget.SearchViewItem; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.Click; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityFragment.java index 565f6f55..d48abee4 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityFragment.java @@ -6,12 +6,10 @@ import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; import android.webkit.WebView; -import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.ui.main.QueryEvent; import com.stardust.scriptdroid.ui.main.ViewPagerFragment; import com.stardust.util.BackPressedHandler; -import com.stardust.widget.EWebView; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.EFragment; @@ -20,7 +18,6 @@ import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import java.net.URLEncoder; -import java.util.regex.Pattern; /** * Created by Stardust on 2017/8/22. diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java index ef057411..000ef095 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/community/CommunityWebView.java @@ -1,25 +1,21 @@ package com.stardust.scriptdroid.ui.main.community; import android.content.Context; -import android.content.DialogInterface; import android.net.Uri; import android.support.design.widget.BottomSheetDialog; import android.support.design.widget.Snackbar; import android.util.AttributeSet; import android.webkit.ValueCallback; -import android.webkit.WebChromeClient; import android.webkit.WebView; -import com.stardust.pio.PFile; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.io.StorageFileProvider; -import com.stardust.scriptdroid.model.script.ScriptFile; import com.stardust.scriptdroid.model.script.Scripts; import com.stardust.scriptdroid.network.download.DownloadManager; import com.stardust.scriptdroid.ui.common.OptionListView; import com.stardust.scriptdroid.ui.common.ScriptOperations; import com.stardust.scriptdroid.ui.filechooser.FileChooserDialogBuilder; -import com.stardust.widget.EWebView; +import com.stardust.scriptdroid.ui.widget.EWebView; import java.util.regex.Pattern; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java index 222ee25b..fd0a74c2 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java @@ -1,15 +1,12 @@ package com.stardust.scriptdroid.ui.main.drawer; -import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.scriptdroid.App; import com.stardust.scriptdroid.Pref; @@ -19,7 +16,7 @@ import com.stardust.scriptdroid.ui.floating.FloatyWindowManger; import com.stardust.scriptdroid.network.NodeBB; import com.stardust.scriptdroid.network.VersionService; import com.stardust.scriptdroid.network.api.UserApi; -import com.stardust.scriptdroid.network.entity.User; +import com.stardust.scriptdroid.network.entity.user.User; import com.stardust.scriptdroid.network.entity.VersionInfo; import com.stardust.scriptdroid.tool.SimpleObserver; import com.stardust.scriptdroid.ui.login.LoginActivity_; @@ -39,12 +36,9 @@ import org.androidannotations.annotations.ViewById; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; -import java.util.concurrent.Callable; - import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItem.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItem.java index d8748827..270a7408 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItem.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerMenuItem.java @@ -7,7 +7,6 @@ import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; import android.util.AttributeSet; import android.view.View; -import android.widget.AutoCompleteTextView; import android.widget.CompoundButton; import android.widget.FrameLayout; import android.widget.ImageView; @@ -15,8 +14,8 @@ import android.widget.TextView; import android.widget.Toast; import com.stardust.scriptdroid.R; -import com.stardust.widget.PrefSwitch; -import com.stardust.widget.SwitchCompat; +import com.stardust.scriptdroid.ui.widget.PrefSwitch; +import com.stardust.scriptdroid.ui.widget.SwitchCompat; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/scripts/ScriptListView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/scripts/ScriptListView.java index eb1eb031..1db73ba7 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/scripts/ScriptListView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/scripts/ScriptListView.java @@ -27,7 +27,7 @@ import com.stardust.scriptdroid.ui.common.ScriptLoopDialog; import com.stardust.scriptdroid.ui.common.ScriptOperations; import com.stardust.scriptdroid.ui.floating.EditorFloaty; import com.stardust.scriptdroid.ui.viewmodel.ScriptList; -import com.stardust.widget.BindableViewHolder; +import com.stardust.scriptdroid.ui.widget.BindableViewHolder; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java index 25eeb875..45b9396e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java @@ -13,7 +13,7 @@ import com.stardust.autojs.core.console.StardustConsole; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.ui.main.ViewPagerFragment; -import com.stardust.widget.SimpleAdapterDataObserver; +import com.stardust.scriptdroid.ui.widget.SimpleAdapterDataObserver; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.Click; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java b/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java index baa4111b..1df1ea04 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/update/UpdateInfoDialogBuilder.java @@ -21,7 +21,7 @@ import com.stardust.scriptdroid.io.StorageFileProvider; import com.stardust.scriptdroid.tool.IntentTool; import com.stardust.util.DownloadTask; import com.stardust.util.IntentUtil; -import com.stardust.widget.CommonMarkdownView; +import com.stardust.scriptdroid.ui.widget.CommonMarkdownView; /** * Created by Stardust on 2017/4/9. diff --git a/app/src/main/java/com/stardust/widget/AppWithStatusBarLayout.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/AppWithStatusBarLayout.java similarity index 98% rename from app/src/main/java/com/stardust/widget/AppWithStatusBarLayout.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/AppWithStatusBarLayout.java index 0d4f7aa4..ab35f03e 100644 --- a/app/src/main/java/com/stardust/widget/AppWithStatusBarLayout.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/AppWithStatusBarLayout.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/stardust/widget/AutoAdapter.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/AutoAdapter.java similarity index 97% rename from app/src/main/java/com/stardust/widget/AutoAdapter.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/AutoAdapter.java index e3453724..49778a3c 100644 --- a/app/src/main/java/com/stardust/widget/AutoAdapter.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/AutoAdapter.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; diff --git a/app/src/main/java/com/stardust/widget/BindableViewHolder.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/BindableViewHolder.java similarity index 88% rename from app/src/main/java/com/stardust/widget/BindableViewHolder.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/BindableViewHolder.java index 308e3ca6..c1305d96 100644 --- a/app/src/main/java/com/stardust/widget/BindableViewHolder.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/BindableViewHolder.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/stardust/widget/BubblePopupMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/BubblePopupMenu.java similarity index 98% rename from app/src/main/java/com/stardust/widget/BubblePopupMenu.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/BubblePopupMenu.java index a3f98075..47fad986 100644 --- a/app/src/main/java/com/stardust/widget/BubblePopupMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/BubblePopupMenu.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.graphics.Color; diff --git a/app/src/main/java/com/stardust/widget/CheckBoxCompat.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/CheckBoxCompat.java similarity index 96% rename from app/src/main/java/com/stardust/widget/CheckBoxCompat.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/CheckBoxCompat.java index 7ab06388..212f3c01 100644 --- a/app/src/main/java/com/stardust/widget/CheckBoxCompat.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/CheckBoxCompat.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.support.v7.widget.AppCompatCheckBox; diff --git a/app/src/main/java/com/stardust/widget/CommonMarkdownView.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/CommonMarkdownView.java similarity index 98% rename from app/src/main/java/com/stardust/widget/CommonMarkdownView.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/CommonMarkdownView.java index 408f630a..d87bbfad 100644 --- a/app/src/main/java/com/stardust/widget/CommonMarkdownView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/CommonMarkdownView.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.content.Intent; @@ -12,7 +12,6 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.FrameLayout; -import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; import org.commonmark.ext.heading.anchor.HeadingAnchorExtension; diff --git a/app/src/main/java/com/stardust/widget/EWebView.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java similarity index 99% rename from app/src/main/java/com/stardust/widget/EWebView.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java index 980b5152..5034bdf8 100644 --- a/app/src/main/java/com/stardust/widget/EWebView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/stardust/widget/ExpandableRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ExpandableRecyclerView.java similarity index 99% rename from app/src/main/java/com/stardust/widget/ExpandableRecyclerView.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/ExpandableRecyclerView.java index 685d2985..ae11a8c0 100644 --- a/app/src/main/java/com/stardust/widget/ExpandableRecyclerView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ExpandableRecyclerView.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.support.annotation.Nullable; diff --git a/app/src/main/java/com/stardust/widget/ItemTouchHelperSimpleCallback.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ItemTouchHelperSimpleCallback.java similarity index 95% rename from app/src/main/java/com/stardust/widget/ItemTouchHelperSimpleCallback.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/ItemTouchHelperSimpleCallback.java index d294749f..4be0c29b 100644 --- a/app/src/main/java/com/stardust/widget/ItemTouchHelperSimpleCallback.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ItemTouchHelperSimpleCallback.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; diff --git a/app/src/main/java/com/stardust/widget/LevelBeamView.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/LevelBeamView.java similarity index 98% rename from app/src/main/java/com/stardust/widget/LevelBeamView.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/LevelBeamView.java index 5f0f1bbb..daabbf49 100644 --- a/app/src/main/java/com/stardust/widget/LevelBeamView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/LevelBeamView.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/stardust/widget/OnItemClickListener.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/OnItemClickListener.java similarity index 84% rename from app/src/main/java/com/stardust/widget/OnItemClickListener.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/OnItemClickListener.java index 15a3abdf..834369d7 100644 --- a/app/src/main/java/com/stardust/widget/OnItemClickListener.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/OnItemClickListener.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/com/stardust/widget/PrefSwitch.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/PrefSwitch.java similarity index 96% rename from app/src/main/java/com/stardust/widget/PrefSwitch.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/PrefSwitch.java index 7aae68ec..f71901dc 100644 --- a/app/src/main/java/com/stardust/widget/PrefSwitch.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/PrefSwitch.java @@ -1,12 +1,10 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.content.SharedPreferences; import android.content.res.TypedArray; import android.preference.PreferenceManager; -import android.support.annotation.IntDef; import android.util.AttributeSet; -import android.view.View; import com.stardust.scriptdroid.R; diff --git a/app/src/main/java/com/stardust/widget/ScrollAwareFABBehavior.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ScrollAwareFABBehavior.java similarity index 98% rename from app/src/main/java/com/stardust/widget/ScrollAwareFABBehavior.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/ScrollAwareFABBehavior.java index ba7e49f9..fed1fde4 100644 --- a/app/src/main/java/com/stardust/widget/ScrollAwareFABBehavior.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ScrollAwareFABBehavior.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/stardust/widget/SearchViewItem.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SearchViewItem.java similarity index 97% rename from app/src/main/java/com/stardust/widget/SearchViewItem.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/SearchViewItem.java index a95acd4b..31661666 100644 --- a/app/src/main/java/com/stardust/widget/SearchViewItem.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SearchViewItem.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.app.Activity; import android.app.SearchManager; diff --git a/app/src/main/java/com/stardust/widget/SimpleAdapterDataObserver.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SimpleAdapterDataObserver.java similarity index 94% rename from app/src/main/java/com/stardust/widget/SimpleAdapterDataObserver.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/SimpleAdapterDataObserver.java index 4f4aa844..f5439cd1 100644 --- a/app/src/main/java/com/stardust/widget/SimpleAdapterDataObserver.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SimpleAdapterDataObserver.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/com/stardust/widget/SimpleRecyclerViewAdapter.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SimpleRecyclerViewAdapter.java similarity index 97% rename from app/src/main/java/com/stardust/widget/SimpleRecyclerViewAdapter.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/SimpleRecyclerViewAdapter.java index 87117611..3873f7c9 100644 --- a/app/src/main/java/com/stardust/widget/SimpleRecyclerViewAdapter.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SimpleRecyclerViewAdapter.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/stardust/widget/SlidingUpPanel.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SlidingUpPanel.java similarity index 98% rename from app/src/main/java/com/stardust/widget/SlidingUpPanel.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/SlidingUpPanel.java index a3ba7e84..f617125a 100644 --- a/app/src/main/java/com/stardust/widget/SlidingUpPanel.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SlidingUpPanel.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/stardust/widget/SwitchCompat.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SwitchCompat.java similarity index 96% rename from app/src/main/java/com/stardust/widget/SwitchCompat.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/SwitchCompat.java index f217a46f..96d90157 100644 --- a/app/src/main/java/com/stardust/widget/SwitchCompat.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/SwitchCompat.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/stardust/widget/ToolbarMenuItem.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ToolbarMenuItem.java similarity index 98% rename from app/src/main/java/com/stardust/widget/ToolbarMenuItem.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/ToolbarMenuItem.java index 526d3c4a..749a91e0 100644 --- a/app/src/main/java/com/stardust/widget/ToolbarMenuItem.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ToolbarMenuItem.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.annotation.TargetApi; import android.content.Context; diff --git a/app/src/main/java/com/stardust/widget/ViewHolderMutableAdapter.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ViewHolderMutableAdapter.java similarity index 94% rename from app/src/main/java/com/stardust/widget/ViewHolderMutableAdapter.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/ViewHolderMutableAdapter.java index a451cc91..a9617831 100644 --- a/app/src/main/java/com/stardust/widget/ViewHolderMutableAdapter.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ViewHolderMutableAdapter.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; diff --git a/app/src/main/java/com/stardust/widget/ViewHolderSupplier.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ViewHolderSupplier.java similarity index 92% rename from app/src/main/java/com/stardust/widget/ViewHolderSupplier.java rename to app/src/main/java/com/stardust/scriptdroid/ui/widget/ViewHolderSupplier.java index 7df88c06..780d682d 100644 --- a/app/src/main/java/com/stardust/widget/ViewHolderSupplier.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/ViewHolderSupplier.java @@ -1,4 +1,4 @@ -package com.stardust.widget; +package com.stardust.scriptdroid.ui.widget; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -6,7 +6,6 @@ import android.view.View; import android.view.ViewGroup; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; /** * Created by Stardust on 2017/4/8. diff --git a/app/src/main/java/com/stardust/view/ViewStack.java b/app/src/main/java/com/stardust/view/ViewStack.java deleted file mode 100644 index 6bd88529..00000000 --- a/app/src/main/java/com/stardust/view/ViewStack.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.stardust.view; - -import android.view.View; - -import java.util.Stack; - -/** - * Created by Stardust on 2017/3/11. - */ - -public class ViewStack { - - public interface CurrentViewSetter { - void setCurrentView(View v); - } - - public interface NavigableView { - void goBack(); - } - - private Stack mStack = new Stack<>(); - private CurrentViewSetter mCurrentViewSetter; - - public ViewStack(CurrentViewSetter currentViewSetter) { - mCurrentViewSetter = currentViewSetter; - } - - public void navigateTo(View v) { - mStack.push(v); - mCurrentViewSetter.setCurrentView(v); - } - - public boolean canGoBack() { - return mStack.size() > 1; - } - - public void goBack() { - mCurrentViewSetter.setCurrentView(mStack.pop()); - } - - public void goBackToFirst() { - while (mStack.size() > 1) { - mStack.pop(); - } - mCurrentViewSetter.setCurrentView(mStack.peek()); - } - - public void setRootView(View view) { - mStack.clear(); - mStack.push(view); - } - - -} diff --git a/app/src/main/res/layout/activity_documentation.xml b/app/src/main/res/layout/activity_documentation.xml index 50cba729..d0627b08 100644 --- a/app/src/main/res/layout/activity_documentation.xml +++ b/app/src/main/res/layout/activity_documentation.xml @@ -20,7 +20,7 @@ - diff --git a/app/src/main/res/layout/activity_view_sample.xml b/app/src/main/res/layout/activity_view_sample.xml index 8711d4ed..38637155 100644 --- a/app/src/main/res/layout/activity_view_sample.xml +++ b/app/src/main/res/layout/activity_view_sample.xml @@ -27,7 +27,7 @@ android:layout_gravity="right" android:orientation="horizontal"> - - - diff --git a/app/src/main/res/layout/drawer_menu_item.xml b/app/src/main/res/layout/drawer_menu_item.xml index f8b26ee8..1c7a09ae 100644 --- a/app/src/main/res/layout/drawer_menu_item.xml +++ b/app/src/main/res/layout/drawer_menu_item.xml @@ -39,7 +39,7 @@ android:textSize="14sp" tools:text="@string/text_auto_operate_service"/> - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_online_docs.xml b/app/src/main/res/layout/fragment_online_docs.xml index 84e9d009..b350f7f1 100644 --- a/app/src/main/res/layout/fragment_online_docs.xml +++ b/app/src/main/res/layout/fragment_online_docs.xml @@ -1,7 +1,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_hierarchy_view_item.xml b/app/src/main/res/layout/layout_hierarchy_view_item.xml index 3e075a3a..9b5d7ad8 100644 --- a/app/src/main/res/layout/layout_hierarchy_view_item.xml +++ b/app/src/main/res/layout/layout_hierarchy_view_item.xml @@ -6,7 +6,7 @@ android:layout_height="32dp" android:padding="5dp"> - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 515eafd1..87afe904 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -264,6 +264,8 @@ 悬浮编辑 选择图标 添加到图标快捷方式 + 登录成功 + 登录失败 diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java index f0ef7e52..f301d902 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java +++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java @@ -20,6 +20,9 @@ import com.stardust.automator.simple_action.SimpleAction; import com.stardust.util.DeveloperUtils; import com.stardust.util.ScreenMetrics; +import org.mozilla.javascript.Context; +import org.mozilla.javascript.NativeJavaObject; + /** * Created by Stardust on 2017/4/2. */ diff --git a/app/src/main/java/com/stardust/view/DrawerAutoClose.java b/common/src/main/java/com/stardust/util/DrawerAutoClose.java similarity index 96% rename from app/src/main/java/com/stardust/view/DrawerAutoClose.java rename to common/src/main/java/com/stardust/util/DrawerAutoClose.java index 86c72f59..df13b073 100644 --- a/app/src/main/java/com/stardust/view/DrawerAutoClose.java +++ b/common/src/main/java/com/stardust/util/DrawerAutoClose.java @@ -1,4 +1,4 @@ -package com.stardust.view; +package com.stardust.util; import android.app.Activity; import android.support.v4.widget.DrawerLayout;