2019-06-03 23:25:05 +02:00
|
|
|
package org.mian.gitnex.activities;
|
|
|
|
|
2020-04-02 02:59:00 +02:00
|
|
|
import android.app.Activity;
|
2019-06-03 23:25:05 +02:00
|
|
|
import android.content.Context;
|
|
|
|
import android.content.Intent;
|
2020-03-21 19:52:52 +01:00
|
|
|
import android.content.pm.PackageInfo;
|
|
|
|
import android.content.pm.PackageManager;
|
2020-01-01 21:03:53 +01:00
|
|
|
import android.graphics.Typeface;
|
2019-06-03 23:25:05 +02:00
|
|
|
import android.os.Bundle;
|
|
|
|
import android.util.Log;
|
2020-09-18 06:51:41 +02:00
|
|
|
import android.view.Menu;
|
2019-06-03 23:25:05 +02:00
|
|
|
import android.view.MenuItem;
|
|
|
|
import android.view.View;
|
2020-06-06 22:04:07 +02:00
|
|
|
import android.view.ViewGroup;
|
2019-06-03 23:25:05 +02:00
|
|
|
import android.widget.ImageView;
|
|
|
|
import android.widget.TextView;
|
2020-04-23 22:40:13 +02:00
|
|
|
import androidx.annotation.NonNull;
|
|
|
|
import androidx.appcompat.app.ActionBarDrawerToggle;
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
import androidx.appcompat.app.AlertDialog;
|
2020-08-18 16:10:46 +02:00
|
|
|
import androidx.appcompat.app.AppCompatActivity;
|
2020-04-23 22:40:13 +02:00
|
|
|
import androidx.appcompat.widget.Toolbar;
|
|
|
|
import androidx.core.view.GravityCompat;
|
|
|
|
import androidx.drawerlayout.widget.DrawerLayout;
|
|
|
|
import androidx.fragment.app.Fragment;
|
|
|
|
import androidx.fragment.app.FragmentManager;
|
2020-08-18 16:10:46 +02:00
|
|
|
import androidx.recyclerview.widget.RecyclerView;
|
2020-04-23 22:40:13 +02:00
|
|
|
import com.google.android.material.navigation.NavigationView;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.R;
|
2020-08-18 16:10:46 +02:00
|
|
|
import org.mian.gitnex.adapters.UserAccountsNavAdapter;
|
2020-04-01 13:26:32 +02:00
|
|
|
import org.mian.gitnex.clients.PicassoService;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.clients.RetrofitClient;
|
2020-08-18 16:10:46 +02:00
|
|
|
import org.mian.gitnex.database.api.UserAccountsApi;
|
|
|
|
import org.mian.gitnex.database.models.UserAccount;
|
2020-07-07 19:15:01 +02:00
|
|
|
import org.mian.gitnex.fragments.AdministrationFragment;
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
|
|
|
|
import org.mian.gitnex.fragments.DraftsFragment;
|
2020-09-30 13:09:24 +02:00
|
|
|
import org.mian.gitnex.fragments.ExploreFragment;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.fragments.MyRepositoriesFragment;
|
2020-07-22 21:32:42 +02:00
|
|
|
import org.mian.gitnex.fragments.NotificationsFragment;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.fragments.OrganizationsFragment;
|
2020-04-23 22:40:13 +02:00
|
|
|
import org.mian.gitnex.fragments.ProfileFragment;
|
|
|
|
import org.mian.gitnex.fragments.RepositoriesFragment;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.fragments.SettingsFragment;
|
|
|
|
import org.mian.gitnex.fragments.StarredRepositoriesFragment;
|
2020-07-07 16:20:43 +02:00
|
|
|
import org.mian.gitnex.fragments.UserAccountsFragment;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.helpers.AlertDialogs;
|
2020-07-07 19:15:01 +02:00
|
|
|
import org.mian.gitnex.helpers.AppUtil;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.helpers.Authorization;
|
2020-03-17 16:56:37 +01:00
|
|
|
import org.mian.gitnex.helpers.ChangeLog;
|
2020-06-06 22:04:07 +02:00
|
|
|
import org.mian.gitnex.helpers.ColorInverter;
|
2020-04-23 22:40:13 +02:00
|
|
|
import org.mian.gitnex.helpers.RoundedTransformation;
|
2020-07-07 19:15:01 +02:00
|
|
|
import org.mian.gitnex.helpers.TinyDB;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.helpers.Toasty;
|
2020-07-22 21:32:42 +02:00
|
|
|
import org.mian.gitnex.helpers.Version;
|
2019-11-25 14:12:44 +01:00
|
|
|
import org.mian.gitnex.models.GiteaVersion;
|
2020-09-18 06:51:41 +02:00
|
|
|
import org.mian.gitnex.models.NotificationCount;
|
2019-06-03 23:25:05 +02:00
|
|
|
import org.mian.gitnex.models.UserInfo;
|
2020-08-18 16:10:46 +02:00
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
2019-06-03 23:25:05 +02:00
|
|
|
import java.util.Objects;
|
2020-06-06 22:04:07 +02:00
|
|
|
import eightbitlab.com.blurview.BlurView;
|
|
|
|
import eightbitlab.com.blurview.RenderScriptBlur;
|
2019-06-03 23:25:05 +02:00
|
|
|
import retrofit2.Call;
|
|
|
|
import retrofit2.Callback;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Author M M Arif
|
|
|
|
*/
|
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetDraftsFragment.BottomSheetListener {
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
private DrawerLayout drawer;
|
2020-06-06 22:04:07 +02:00
|
|
|
private BlurView blurView;
|
2020-04-23 22:40:13 +02:00
|
|
|
private TextView userFullName;
|
|
|
|
private TextView userEmail;
|
|
|
|
private ImageView userAvatar;
|
2020-06-06 22:04:07 +02:00
|
|
|
private ImageView userAvatarBackground;
|
|
|
|
private ViewGroup navHeaderFrame;
|
2020-04-23 22:40:13 +02:00
|
|
|
private TextView toolbarTitle;
|
|
|
|
final Context ctx = this;
|
2020-04-28 15:47:25 +02:00
|
|
|
private Context appCtx;
|
2020-10-23 20:13:13 +02:00
|
|
|
private static TinyDB tinyDb;
|
2020-04-23 22:40:13 +02:00
|
|
|
private Typeface myTypeface;
|
|
|
|
|
2020-09-18 06:51:41 +02:00
|
|
|
private String instanceUrl;
|
|
|
|
private String loginUid;
|
|
|
|
private String instanceToken;
|
|
|
|
|
|
|
|
private View hView;
|
|
|
|
private MenuItem navNotifications;
|
|
|
|
private TextView notificationCounter;
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
@Override
|
|
|
|
protected int getLayoutResourceId() {
|
|
|
|
|
|
|
|
return R.layout.activity_main;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
|
|
|
|
|
|
super.onCreate(savedInstanceState);
|
2020-04-28 15:47:25 +02:00
|
|
|
appCtx = getApplicationContext();
|
|
|
|
|
2020-10-23 20:13:13 +02:00
|
|
|
tinyDb = new TinyDB(appCtx);
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putBoolean("noConnection", false);
|
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
Intent mainIntent = getIntent();
|
|
|
|
String launchFragment = mainIntent.getStringExtra("launchFragment");
|
|
|
|
|
2020-09-18 06:51:41 +02:00
|
|
|
instanceUrl = tinyDb.getString("instanceUrl");
|
|
|
|
loginUid = tinyDb.getString("loginUid");
|
|
|
|
instanceToken = "token " + tinyDb.getString(loginUid + "-token");
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
if(tinyDb.getString("dateFormat").isEmpty()) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putString("dateFormat", "pretty");
|
|
|
|
}
|
|
|
|
|
|
|
|
if(tinyDb.getString("codeBlockStr").isEmpty()) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
|
|
|
|
tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
|
|
|
|
}
|
|
|
|
|
|
|
|
if(tinyDb.getString("enableCounterIssueBadgeInit").isEmpty()) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putBoolean("enableCounterIssueBadge", true);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(tinyDb.getString("homeScreenStr").isEmpty()) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
|
|
|
tinyDb.putString("homeScreenStr", "yes");
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putInt("homeScreenId", 0);
|
|
|
|
}
|
|
|
|
|
2020-06-28 17:11:59 +02:00
|
|
|
boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
if(!tinyDb.getBoolean("loggedInMode")) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
logout(this, ctx);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-08-06 17:31:31 +02:00
|
|
|
if(tinyDb.getInt("currentActiveAccountId") <= 0) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-08-06 17:31:31 +02:00
|
|
|
AlertDialogs.forceLogoutDialog(ctx, getResources().getString(R.string.forceLogoutDialogHeader), getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
|
|
|
|
}
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
Toolbar toolbar = findViewById(R.id.toolbar);
|
|
|
|
toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
|
|
|
|
|
|
|
|
switch(tinyDb.getInt("customFontId", -1)) {
|
|
|
|
|
|
|
|
case 0:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
|
|
|
|
break;
|
|
|
|
case 2:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
|
|
|
|
break;
|
|
|
|
default:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
toolbarTitle.setTypeface(myTypeface);
|
|
|
|
setSupportActionBar(toolbar);
|
|
|
|
|
|
|
|
FragmentManager fm = getSupportFragmentManager();
|
|
|
|
Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(fragmentById instanceof SettingsFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
|
|
|
|
}
|
|
|
|
else if(fragmentById instanceof MyRepositoriesFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
|
|
|
}
|
|
|
|
else if(fragmentById instanceof StarredRepositoriesFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
|
|
|
}
|
|
|
|
else if(fragmentById instanceof OrganizationsFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
|
|
|
}
|
2020-09-30 13:09:24 +02:00
|
|
|
else if(fragmentById instanceof ExploreFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
|
|
|
|
}
|
2020-07-22 21:32:42 +02:00
|
|
|
else if(fragmentById instanceof NotificationsFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-07-22 21:32:42 +02:00
|
|
|
toolbarTitle.setText(R.string.pageTitleNotifications);
|
|
|
|
}
|
2020-04-23 22:40:13 +02:00
|
|
|
else if(fragmentById instanceof ProfileFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
|
|
|
}
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
else if(fragmentById instanceof DraftsFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
|
|
|
|
}
|
2020-04-23 22:40:13 +02:00
|
|
|
else if(fragmentById instanceof AdministrationFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
|
|
|
|
}
|
2020-07-07 16:20:43 +02:00
|
|
|
else if(fragmentById instanceof UserAccountsFragment) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-07-07 16:20:43 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
|
|
|
|
}
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-09-18 06:51:41 +02:00
|
|
|
getNotificationsCount(instanceUrl, instanceToken);
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
drawer = findViewById(R.id.drawer_layout);
|
|
|
|
NavigationView navigationView = findViewById(R.id.nav_view);
|
|
|
|
navigationView.setNavigationItemSelectedListener(this);
|
2020-09-18 06:51:41 +02:00
|
|
|
hView = navigationView.getHeaderView(0);
|
|
|
|
|
|
|
|
Menu menu = navigationView.getMenu();
|
|
|
|
navNotifications = menu.findItem(R.id.nav_notifications);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
drawer.addDrawerListener(toggle);
|
2020-04-23 22:40:13 +02:00
|
|
|
drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onDrawerOpened(@NonNull View drawerView) {
|
|
|
|
|
2020-09-18 06:51:41 +02:00
|
|
|
getNotificationsCount(instanceUrl, instanceToken);
|
2020-08-09 10:23:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(tinyDb.getBoolean("noConnection")) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-08-06 17:16:51 +02:00
|
|
|
Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putBoolean("noConnection", false);
|
|
|
|
}
|
|
|
|
|
|
|
|
String userEmailNav = tinyDb.getString("userEmail");
|
|
|
|
String userFullNameNav = tinyDb.getString("userFullname");
|
|
|
|
String userAvatarNav = tinyDb.getString("userAvatar");
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
blurView = hView.findViewById(R.id.blurView);
|
2020-04-23 22:40:13 +02:00
|
|
|
userEmail = hView.findViewById(R.id.userEmail);
|
2020-06-06 22:04:07 +02:00
|
|
|
userFullName = hView.findViewById(R.id.userFullname);
|
|
|
|
userAvatar = hView.findViewById(R.id.userAvatar);
|
|
|
|
userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
|
|
|
|
navHeaderFrame = hView.findViewById(R.id.navHeaderFrame);
|
|
|
|
|
2020-08-18 16:10:46 +02:00
|
|
|
List<UserAccount> userAccountsList;
|
|
|
|
userAccountsList = new ArrayList<>();
|
|
|
|
UserAccountsApi userAccountsApi;
|
|
|
|
userAccountsApi = new UserAccountsApi(ctx);
|
|
|
|
|
|
|
|
RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.navRecyclerViewUserAccounts);
|
|
|
|
UserAccountsNavAdapter adapterUserAccounts;
|
|
|
|
|
|
|
|
adapterUserAccounts = new UserAccountsNavAdapter(ctx, userAccountsList, drawer, toolbarTitle);
|
|
|
|
|
|
|
|
userAccountsApi.getAllAccounts().observe((AppCompatActivity) ctx, userAccounts -> {
|
|
|
|
|
|
|
|
if(userAccounts.size() > 0) {
|
|
|
|
|
|
|
|
userAccountsList.addAll(userAccounts);
|
|
|
|
navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
userEmail.setTypeface(myTypeface);
|
|
|
|
userFullName.setTypeface(myTypeface);
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(!userEmailNav.equals("")) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
userEmail.setText(userEmailNav);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!userFullNameNav.equals("")) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
userFullName.setText(userFullNameNav);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!userAvatarNav.equals("")) {
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
PicassoService.getInstance(ctx).get()
|
|
|
|
.load(userAvatarNav)
|
|
|
|
.placeholder(R.drawable.loader_animated)
|
|
|
|
.transform(new RoundedTransformation(8, 0))
|
|
|
|
.resize(160, 160)
|
|
|
|
.centerCrop().into(userAvatar);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
PicassoService.getInstance(ctx).get()
|
|
|
|
.load(userAvatarNav)
|
|
|
|
.into(userAvatarBackground, new com.squareup.picasso.Callback() {
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
@Override
|
|
|
|
public void onSuccess() {
|
|
|
|
|
|
|
|
int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
|
|
|
|
|
|
|
|
userFullName.setTextColor(textColor);
|
|
|
|
userEmail.setTextColor(textColor);
|
|
|
|
|
|
|
|
blurView.setupWith(navHeaderFrame)
|
|
|
|
.setBlurAlgorithm(new RenderScriptBlur(ctx))
|
|
|
|
.setBlurRadius(5)
|
|
|
|
.setHasFixedTransformationMatrix(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onError(Exception e) {}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
userAvatar.setOnClickListener(v -> {
|
|
|
|
|
2020-06-22 09:57:21 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
2020-06-06 22:04:07 +02:00
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
2020-09-30 13:09:24 +02:00
|
|
|
navigationView.setCheckedItem(R.id.nav_profile);
|
2020-06-06 22:04:07 +02:00
|
|
|
drawer.closeDrawers();
|
2020-04-23 22:40:13 +02:00
|
|
|
});
|
|
|
|
|
2020-08-09 10:23:19 +02:00
|
|
|
String currentVersion = tinyDb.getString("giteaVersion");
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-08-09 10:23:19 +02:00
|
|
|
navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDb.getBoolean("userIsAdmin"));
|
|
|
|
navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(currentVersion).higherOrEqual("1.12.3"));
|
|
|
|
}
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
@Override
|
2020-06-06 22:04:07 +02:00
|
|
|
public void onDrawerClosed(@NonNull View drawerView) {}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onDrawerStateChanged(int newState) {}
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
});
|
|
|
|
|
|
|
|
toggle.syncState();
|
2020-07-12 19:18:50 +02:00
|
|
|
toolbar.setNavigationIcon(R.drawable.ic_menu);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
if(launchFragment != null) {
|
|
|
|
|
2020-07-22 21:32:42 +02:00
|
|
|
mainIntent.removeExtra("launchFragment");
|
|
|
|
|
|
|
|
switch(launchFragment) {
|
|
|
|
|
|
|
|
case "drafts":
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-07-22 21:32:42 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_comments_draft);
|
|
|
|
return;
|
|
|
|
case "notifications":
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-07-22 21:32:42 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_notifications);
|
|
|
|
return;
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-23 20:13:13 +02:00
|
|
|
String launchFragmentByHandler = mainIntent.getStringExtra("launchFragmentByLinkHandler");
|
|
|
|
|
|
|
|
if(launchFragmentByHandler != null) {
|
|
|
|
|
|
|
|
mainIntent.removeExtra("launchFragmentByLinkHandler");
|
|
|
|
|
|
|
|
switch(launchFragmentByHandler) {
|
|
|
|
|
|
|
|
case "repos":
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-10-23 20:13:13 +02:00
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_repositories);
|
|
|
|
return;
|
|
|
|
case "org":
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-10-23 20:13:13 +02:00
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_organizations);
|
|
|
|
return;
|
|
|
|
case "notification":
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-10-23 20:13:13 +02:00
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_notifications);
|
|
|
|
return;
|
|
|
|
case "explore":
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-10-23 20:13:13 +02:00
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_explore);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(savedInstanceState == null) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-08-12 09:31:39 +02:00
|
|
|
if(!new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.3")) {
|
|
|
|
|
|
|
|
if(tinyDb.getInt("homeScreenId") == 7) {
|
|
|
|
|
|
|
|
tinyDb.putInt("homeScreenId", 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
switch(tinyDb.getInt("homeScreenId")) {
|
|
|
|
|
|
|
|
case 1:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_starred_repos);
|
|
|
|
break;
|
|
|
|
case 2:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_organizations);
|
|
|
|
break;
|
|
|
|
case 3:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_repositories);
|
|
|
|
break;
|
|
|
|
case 4:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_profile);
|
|
|
|
break;
|
2020-07-19 12:05:08 +02:00
|
|
|
case 5:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-07-19 12:05:08 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
|
2020-09-30 13:09:24 +02:00
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
|
2020-07-19 12:05:08 +02:00
|
|
|
navigationView.setCheckedItem(R.id.nav_explore);
|
|
|
|
break;
|
|
|
|
case 6:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-07-19 12:05:08 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_comments_draft);
|
|
|
|
break;
|
2020-08-12 09:31:39 +02:00
|
|
|
case 7:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-08-12 09:31:39 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_notifications);
|
|
|
|
break;
|
2020-06-06 22:04:07 +02:00
|
|
|
default:
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
|
|
|
|
navigationView.setCheckedItem(R.id.nav_home);
|
|
|
|
break;
|
2020-04-23 22:40:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!connToInternet) {
|
|
|
|
|
|
|
|
if(!tinyDb.getBoolean("noConnection")) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-08-06 17:16:51 +02:00
|
|
|
Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
|
2020-04-23 22:40:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
tinyDb.putBoolean("noConnection", true);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
loadUserInfo(instanceUrl, instanceToken, loginUid);
|
2020-04-23 22:40:13 +02:00
|
|
|
giteaVersion(instanceUrl);
|
|
|
|
tinyDb.putBoolean("noConnection", false);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Changelog popup
|
|
|
|
int versionCode = 0;
|
2020-07-22 21:32:42 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
try {
|
2020-07-22 21:32:42 +02:00
|
|
|
|
2020-04-28 15:47:25 +02:00
|
|
|
PackageInfo packageInfo = appCtx.getPackageManager().getPackageInfo(appCtx.getPackageName(), 0);
|
2020-04-23 22:40:13 +02:00
|
|
|
versionCode = packageInfo.versionCode;
|
|
|
|
}
|
|
|
|
catch(PackageManager.NameNotFoundException e) {
|
2020-07-22 21:32:42 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
Log.e("changelogDialog", Objects.requireNonNull(e.getMessage()));
|
|
|
|
}
|
|
|
|
|
|
|
|
if(versionCode > tinyDb.getInt("versionCode")) {
|
2020-07-22 21:32:42 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putInt("versionCode", versionCode);
|
|
|
|
tinyDb.putBoolean("versionFlag", true);
|
2020-07-22 21:32:42 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
ChangeLog changelogDialog = new ChangeLog(this);
|
|
|
|
changelogDialog.showDialog();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-27 09:36:57 +02:00
|
|
|
public void setActionBarTitle(String title) {
|
|
|
|
|
|
|
|
toolbarTitle.setText(title);
|
|
|
|
}
|
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
@Override
|
|
|
|
public void onButtonClicked(String text) {
|
|
|
|
|
|
|
|
TinyDB tinyDb = new TinyDB(ctx);
|
|
|
|
int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
|
|
|
|
|
|
|
|
if("deleteDrafts".equals(text)) {
|
|
|
|
|
|
|
|
if(currentActiveAccountId > 0) {
|
|
|
|
|
|
|
|
FragmentManager fm = getSupportFragmentManager();
|
|
|
|
DraftsFragment frag = (DraftsFragment) fm.findFragmentById(R.id.fragment_container);
|
|
|
|
|
|
|
|
if(frag != null) {
|
|
|
|
|
2020-08-06 17:16:51 +02:00
|
|
|
new AlertDialog.Builder(ctx)
|
|
|
|
.setTitle(R.string.deleteAllDrafts)
|
|
|
|
.setIcon(R.drawable.ic_delete)
|
|
|
|
.setCancelable(false)
|
|
|
|
.setMessage(R.string.deleteAllDraftsDialogMessage)
|
|
|
|
.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
|
2020-08-06 17:16:51 +02:00
|
|
|
frag.deleteAllDrafts(currentActiveAccountId);
|
|
|
|
dialog.dismiss();
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
|
2020-08-06 17:16:51 +02:00
|
|
|
})
|
|
|
|
.setNeutralButton(R.string.cancelButton, null).show();
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
}
|
|
|
|
else {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
Toasty.error(ctx, getResources().getString(R.string.genericError));
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
Toasty.error(ctx, getResources().getString(R.string.genericError));
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
@Override
|
|
|
|
public void onBackPressed() {
|
|
|
|
|
|
|
|
if(drawer.isDrawerOpen(GravityCompat.START)) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
drawer.closeDrawer(GravityCompat.START);
|
|
|
|
}
|
|
|
|
else {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
super.onBackPressed();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
|
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
int id = menuItem.getItemId();
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
if(id == R.id.nav_home) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_organizations) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_profile) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_repositories) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_settings) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_logout) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
logout(this, ctx);
|
|
|
|
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_starred_repos) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_explore) {
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_notifications) {
|
2020-07-22 21:32:42 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(R.string.pageTitleNotifications);
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_comments_draft) {
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
|
|
|
|
}
|
|
|
|
else if(id == R.id.nav_administration) {
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-10-29 14:13:19 +01:00
|
|
|
toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
|
|
|
|
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
|
2020-04-23 22:40:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
drawer.closeDrawer(GravityCompat.START);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static void logout(Activity activity, Context ctx) {
|
|
|
|
|
|
|
|
tinyDb.putBoolean("loggedInMode", false);
|
|
|
|
tinyDb.remove("basicAuthPassword");
|
|
|
|
tinyDb.putBoolean("basicAuthFlag", false);
|
|
|
|
//tinyDb.clear();
|
|
|
|
activity.finish();
|
|
|
|
ctx.startActivity(new Intent(ctx, LoginActivity.class));
|
|
|
|
}
|
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
@Override
|
|
|
|
public boolean onOptionsItemSelected(MenuItem item) {
|
|
|
|
|
|
|
|
int id = item.getItemId();
|
|
|
|
|
|
|
|
if(id == R.id.genericMenu) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
Implement drafts, introduce Room persistence library for db (#139)
Fix no draft message
translation updates
format improvements
typo update
some renaming refactors
Use better naming convention
remove duplicate source
arrange draft titles
enhance click listener area
Launch drafts from reply screen and clean up
Add message draft saved
update repositories tasks
Update user accounts repository with thread, remove async tasks
remove async task in drafts
update layout, change async to thread in drafts
Merge branch 'master' into pull_139
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
Merge branch 'pull_139' of codeberg.org:gitnex/GitNex into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139
Merge branch 'master' into pull_139 and fix conflicts
# Conflicts:
# app/build.gradle
# app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
# app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
# app/src/main/res/values/strings.xml
Code Format
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/res/values/strings.xml
Go to draft, save on type and other fixes
delete all drafts, added messages where needed
delete draft
Force logout
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/src/main/java/org/mian/gitnex/activities/MainActivity.java
# app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java
check if account data is null, we need to log the user out for the 1st time.
Merge branch 'master' into 15-comments-draft
fix repo owner, name sequence
Add comments for test, show drafts list
Add repos to db
Add account to db and other refactors to the code
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
Merge branch 'master' into 15-comments-draft
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
Merge branch 'master' into 15-comments-draft
merge
more queries, added dao repositories, layout update
Added queries in dao
some refactor. added models, dao, entities (accounts, repositories, drafts)
WIP on implementing drafts, introduced Room persistence library for db.
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/139
Reviewed-by: opyale <opyale@noreply.codeberg.org>
2020-07-04 22:51:55 +02:00
|
|
|
BottomSheetDraftsFragment bottomSheet = new BottomSheetDraftsFragment();
|
|
|
|
bottomSheet.show(getSupportFragmentManager(), "draftsBottomSheet");
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return super.onOptionsItemSelected(item);
|
|
|
|
}
|
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
private void giteaVersion(final String instanceUrl) {
|
|
|
|
|
2020-04-28 15:47:25 +02:00
|
|
|
final TinyDB tinyDb = new TinyDB(appCtx);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
|
|
|
|
|
2020-04-28 15:47:25 +02:00
|
|
|
Call<GiteaVersion> callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(token);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
callVersion.enqueue(new Callback<GiteaVersion>() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
|
|
|
|
|
|
|
|
if(responseVersion.code() == 200) {
|
|
|
|
|
|
|
|
GiteaVersion version = responseVersion.body();
|
|
|
|
assert version != null;
|
|
|
|
|
|
|
|
tinyDb.putString("giteaVersion", version.getVersion());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
|
|
|
|
|
|
|
|
Log.e("onFailure-version", t.toString());
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2020-06-06 22:04:07 +02:00
|
|
|
private void loadUserInfo(String instanceUrl, String token, String loginUid) {
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-04-28 15:47:25 +02:00
|
|
|
final TinyDB tinyDb = new TinyDB(appCtx);
|
2020-04-23 22:40:13 +02:00
|
|
|
|
2020-04-28 15:47:25 +02:00
|
|
|
Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo(Authorization.returnAuthentication(ctx, loginUid, token));
|
2020-04-23 22:40:13 +02:00
|
|
|
|
|
|
|
call.enqueue(new Callback<UserInfo>() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
|
|
|
|
|
|
|
|
UserInfo userDetails = response.body();
|
|
|
|
|
|
|
|
if(response.isSuccessful()) {
|
|
|
|
|
|
|
|
if(response.code() == 200) {
|
|
|
|
|
|
|
|
assert userDetails != null;
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(userDetails.getIs_admin() != null) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putBoolean("userIsAdmin", userDetails.getIs_admin());
|
|
|
|
}
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putString("userLogin", userDetails.getLogin());
|
|
|
|
tinyDb.putInt("userId", userDetails.getId());
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(!userDetails.getFullname().equals("")) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putString("userFullname", userDetails.getFullname());
|
|
|
|
}
|
|
|
|
else {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putString("userFullname", userDetails.getLogin());
|
|
|
|
}
|
|
|
|
|
|
|
|
tinyDb.putString("userEmail", userDetails.getEmail());
|
|
|
|
tinyDb.putString("userAvatar", userDetails.getAvatar());
|
2020-06-06 22:04:07 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
if(userDetails.getLang() != null) {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
tinyDb.putString("userLang", userDetails.getLang());
|
|
|
|
}
|
|
|
|
else {
|
2020-10-29 14:13:19 +01:00
|
|
|
|
2020-06-30 16:43:27 +02:00
|
|
|
tinyDb.putString("userLang", "");
|
2020-04-23 22:40:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(response.code() == 401) {
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
|
|
|
|
}
|
|
|
|
else {
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-06-30 16:43:27 +02:00
|
|
|
String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
|
2020-08-06 17:16:51 +02:00
|
|
|
Toasty.error(ctx, toastError);
|
2020-04-23 22:40:13 +02:00
|
|
|
}
|
|
|
|
}
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
@Override
|
|
|
|
public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
Log.e("onFailure", t.toString());
|
|
|
|
}
|
|
|
|
});
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-04-23 22:40:13 +02:00
|
|
|
}
|
2019-06-03 23:25:05 +02:00
|
|
|
|
2020-09-18 06:51:41 +02:00
|
|
|
private void getNotificationsCount(String instanceUrl, String token) {
|
|
|
|
|
|
|
|
Call<NotificationCount> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkUnreadNotifications(token);
|
|
|
|
|
|
|
|
call.enqueue(new Callback<NotificationCount>() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
|
|
|
|
|
|
|
|
NotificationCount notificationCount = response.body();
|
|
|
|
|
|
|
|
if(response.code() == 200) {
|
|
|
|
|
|
|
|
assert notificationCount != null;
|
|
|
|
notificationCounter = navNotifications.getActionView().findViewById(R.id.counterBadgeNotification);
|
|
|
|
notificationCounter.setText(String.valueOf(notificationCount.getCounter()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
|
|
|
|
|
|
|
|
Log.e("onFailure-notification", t.toString());
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2019-06-03 23:25:05 +02:00
|
|
|
}
|