Merge branch 'release-2.3.2' of gitnex/GitNex into release-2.3

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 80
+        versionCode 82
-        versionName "2.3.0"
+        versionName "2.3.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java

@@ -340,13 +340,13 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
 
                         List<Milestones> milestonesList_ = response.body();
 
-                        milestonesList.add(new Milestones(0,"No milestone"));
+                        milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
                         assert milestonesList_ != null;
                         if(milestonesList_.size() > 0) {
                             for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                //String mStone = getString(R.string.spinnerMilestoneText, milestonesList_.get(i).getTitle(), milestonesList_.get(i).getState());
+                                //Don't translate "open" is a enum
-                                if(milestonesList_.get(i).getState().equals(getString(R.string.issueStatusOpen))) {
+                                if(milestonesList_.get(i).getState().equals("open")) {
                                     Milestones data = new Milestones(
                                             milestonesList_.get(i).getId(),
                                             milestonesList_.get(i).getTitle()

app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java

@@ -26,6 +26,8 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -71,11 +73,26 @@ public class FileViewActivity extends AppCompatActivity {
 
         TextView toolbar_title = findViewById(R.id.toolbar_title);
         toolbar_title.setMovementMethod(new ScrollingMovementMethod());
-        toolbar_title.setText(singleFileName);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
+        try {
+
+            singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
+            singleFileName = singleFileName.replaceAll("//", "/");
+            singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
+
+        }
+        catch (UnsupportedEncodingException e) {
+
+            assert singleFileName != null;
+            Log.i("singleFileName", singleFileName);
+
+        }
+
+        toolbar_title.setText(singleFileName);
+
         getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
 
     }

app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java

@@ -168,12 +168,12 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
-            if(issuesModel.getPull_request() != null) {
+            /*if(issuesModel.getPull_request() != null) {
                 if (issuesModel.getPull_request().isMerged()) {
                     relativeLayoutFrame.setVisibility(View.GONE);
                     relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
                 }
-            }
+            }*/
 
             if (!issuesModel.getUser().getFull_name().equals("")) {
                 issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));

app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java

@@ -168,12 +168,12 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
-            if(issuesModel.getPull_request() != null) {
+            /*if(issuesModel.getPull_request() != null) {
                 if (!issuesModel.getPull_request().isMerged()) {
                     relativeLayoutFrame.setVisibility(View.GONE);
                     relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
                 }
-            }
+            }*/
 
             if (!issuesModel.getUser().getFull_name().equals("")) {
                 issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));

app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java

@@ -140,6 +140,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
         fileStructure.setText(breadcrumbBuilder);
 
+        String dirName_ = fileStructure.getText().toString();
+        dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
+        final String finalDirName_ = dirName_;
+
         mBreadcrumbsView.addItem(createItem(dirName));
         mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
             @Override
@@ -154,7 +158,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
                 String filterDir = fileStructure.getText().toString();
                 String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
                 fileStructure.setText(result + item.getSelectedItem());
-                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, fileStructure.getText().toString());
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
 
             }
 
@@ -164,7 +168,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
             }
         });
 
-        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, fileStructure.getText().toString());
+        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
 
     }
 

app/src/main/java/org/mian/gitnex/util/AppUtil.java

@@ -218,7 +218,7 @@ public class AppUtil {
                 "coffee", "rc", "rs", "rust", "basic", "clj", "css", "dart", "lisp", "erl", "hs", "lsp", "rkt",
                 "ss", "llvm", "ll", "lua", "matlab", "pascal", "r", "scala", "sql", "latex", "tex", "vb", "vbs",
                 "vhd", "tcl", "wiki.meta", "yaml", "yml", "markdown", "xml", "proto", "regex", "py", "pl", "js",
-                "html", "htm", "volt", "ini", "htaccess", "conf", "gitignore"};
+                "html", "htm", "volt", "ini", "htaccess", "conf", "gitignore", "gradle", "txt", "properties", "bat"};
 
         return Arrays.asList(extValues).contains(ext);
 

app/src/main/res/layout/activity_file_view.xml

@@ -64,6 +64,7 @@
                 android:textColor="@color/colorWhite"
                 android:textSize="14sp"
                 android:padding="15dp"
+                android:textIsSelectable="true"
                 />
 
         </ScrollView>

app/src/main/res/layout/activity_login.xml

@@ -39,14 +39,18 @@
             android:id="@+id/loginMethod"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:layout_margin="10dp"
+            android:background="@drawable/shape_inputs"
+            android:orientation="vertical">
+
             <RadioButton
                 android:id="@+id/loginUsernamePassword"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/loginViaPassword"
                 android:checked="true"
-                android:layout_marginEnd="30dp"
                 android:theme="@style/radioButtonsInDarkTheme"
                 android:textColor="@color/white"/>
             <RadioButton
@@ -56,6 +60,7 @@
                 android:text="@string/copyToken"
                 android:theme="@style/radioButtonsInDarkTheme"
                 android:textColor="@color/white"/>
+
         </RadioGroup>
 
         <LinearLayout

app/src/main/res/values/strings.xml

@@ -237,6 +237,7 @@
     <string name="issueDescriptionEmpty">Issue description is empty</string>
     <string name="issueCreated">New issue created successfully</string>
     <string name="issueCreatedError">Something went wrong, please try again</string>
+    <string name="issueCreatedNoMilestone">No milestone</string>
     <string name="noAssigneesFound">No collaborators found</string>
     <string name="noLabelsFound">No labels found</string>
 

app/src/main/res/values/styles.xml

@@ -33,6 +33,8 @@
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:colorBackground">@color/colorPrimary</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
     </style>
 
     <style name="confirmDialog" parent="Theme.AppCompat.Dialog.Alert">

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
 
     }
 }

fastlane/metadata/android/en-US/changelogs/81.txt

@@ -0,0 +1,8 @@
+2.3.1
+Improvement: Copy text, support more files in file viewer
+Bugfix: Fix RTL alignments
+Bugfix: Revert to show all issues/prs
+Bugfix: Fix url decode in file viewer
+
+For more, check the release notes.
+https://gitea.com/gitnex/GitNex/releases

fastlane/metadata/android/en-US/changelogs/82.txt

@@ -0,0 +1,6 @@
+2.3.2
+Bugfix: Slashes in URL(file viewer)
+Bugfix: No milestones when creating issue if user has other language selected
+
+For more, check the release notes.
+https://gitea.com/gitnex/GitNex/releases